Revision 3ecf6786 lib/mcpu.py

b/lib/mcpu.py
29 29
"""
30 30

  
31 31

  
32
import os
33
import os.path
34
import time
35

  
36 32
from ganeti import opcodes
37
from ganeti import logger
38 33
from ganeti import constants
39
from ganeti import utils
40 34
from ganeti import errors
41 35
from ganeti import rpc
42 36
from ganeti import cmdlib
......
107 101

  
108 102
    """
109 103
    if not isinstance(op, opcodes.OpCode):
110
      raise errors.ProgrammerError, ("Non-opcode instance passed"
111
                                     " to ExecOpcode")
104
      raise errors.ProgrammerError("Non-opcode instance passed"
105
                                   " to ExecOpcode")
112 106

  
113 107
    lu_class = self.DISPATCH_TABLE.get(op.__class__, None)
114 108
    if lu_class is None:
115
      raise errors.OpCodeUnknown, "Unknown opcode"
109
      raise errors.OpCodeUnknown("Unknown opcode")
116 110

  
117 111
    if lu_class.REQ_CLUSTER and self.cfg is None:
118 112
      self.cfg = config.ConfigWriter()
......
140 134

  
141 135
    """
142 136
    if not isinstance(op, opcodes.OpCode):
143
      raise errors.ProgrammerError, ("Non-opcode instance passed"
144
                                     " to ExecOpcode")
137
      raise errors.ProgrammerError("Non-opcode instance passed"
138
                                   " to ExecOpcode")
145 139

  
146 140
    lu_class = self.DISPATCH_TABLE.get(op.__class__, None)
147 141
    if lu_class is None:
148
      raise errors.OpCodeUnknown, "Unknown opcode"
142
      raise errors.OpCodeUnknown("Unknown opcode")
149 143

  
150 144
    if lu_class.REQ_CLUSTER and self.cfg is None:
151 145
      self.cfg = config.ConfigWriter()
......
231 225
    if phase == constants.HOOKS_PHASE_PRE:
232 226
      errs = []
233 227
      if not results:
234
        raise errors.HooksFailure, "Communication failure"
228
        raise errors.HooksFailure("Communication failure")
235 229
      for node_name in results:
236 230
        res = results[node_name]
237 231
        if res is False or not isinstance(res, list):
238
          raise errors.HooksFailure, ("Communication failure to node %s" %
239
                                      node_name)
232
          raise errors.HooksFailure("Communication failure to node %s" %
233
                                    node_name)
240 234
        for script, hkr, output in res:
241 235
          if hkr == constants.HKR_FAIL:
242 236
            output = output.strip().encode("string_escape")
243 237
            errs.append((node_name, script, output))
244 238
      if errs:
245
        raise errors.HooksAbort, errs
239
        raise errors.HooksAbort(errs)

Also available in: Unified diff