Revision 8ad0da1e

b/lib/cmdlib.py
957 957
  hm = lu.proc.BuildHooksManager(lu)
958 958
  try:
959 959
    hm.RunPhase(constants.HOOKS_PHASE_POST, nodes=[node_name])
960
  except:
961
    # pylint: disable=W0702
962
    lu.LogWarning("Errors occurred running hooks on %s" % node_name)
960
  except Exception, err: # pylint: disable=W0703
961
    lu.LogWarning("Errors occurred running hooks on %s: %s" % (node_name, err))
963 962

  
964 963

  
965 964
def _CheckOutputFields(static, dynamic, selected):
b/lib/netutils.py
1 1
#
2 2
#
3 3

  
4
# Copyright (C) 2010 Google Inc.
4
# Copyright (C) 2010, 2011, 2012 Google Inc.
5 5
#
6 6
# This program is free software; you can redistribute it and/or modify
7 7
# it under the terms of the GNU General Public License as published by
......
280 280
  if source is not None:
281 281
    try:
282 282
      sock.bind((source, 0))
283
    except socket.error, (errcode, _):
284
      if errcode == errno.EADDRNOTAVAIL:
283
    except socket.error, err:
284
      if err[0] == errno.EADDRNOTAVAIL:
285 285
        success = False
286 286

  
287 287
  sock.settimeout(timeout)
......
292 292
    success = True
293 293
  except socket.timeout:
294 294
    success = False
295
  except socket.error, (errcode, _):
296
    success = (not live_port_needed) and (errcode == errno.ECONNREFUSED)
295
  except socket.error, err:
296
    success = (not live_port_needed) and (err[0] == errno.ECONNREFUSED)
297 297

  
298 298
  return success
299 299

  
b/qa/ganeti-qa.py
44 44
import qa_utils
45 45

  
46 46
from ganeti import utils
47
from ganeti import rapi
47
from ganeti import rapi # pylint: disable=W0611
48 48
from ganeti import constants
49 49

  
50 50
import ganeti.rapi.client # pylint: disable=W0611
b/qa/qa_config.py
80 80

  
81 81

  
82 82
def get(name, default=None):
83
  return cfg.get(name, default)
83
  return cfg.get(name, default) # pylint: disable=E1103
84 84

  
85 85

  
86 86
class Either:
......
149 149
    _cfg = cfg
150 150

  
151 151
  # Get settings for all tests
152
  cfg_tests = _cfg.get("tests", {})
152
  cfg_tests = _cfg.get("tests", {}) # pylint: disable=E1103
153 153

  
154 154
  # Get default setting
155 155
  default = cfg_tests.get("default", True)
......
162 162
  """Returns path to instance check script or C{None}.
163 163

  
164 164
  """
165
  return cfg.get(_INSTANCE_CHECK_KEY, None)
165
  return cfg.get(_INSTANCE_CHECK_KEY, None) # pylint: disable=E1103
166 166

  
167 167

  
168 168
def GetEnabledHypervisors():

Also available in: Unified diff