Bump version to 2.5.0~rc1

[ganeti-local] / lib / client / gnt_instance.py

diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 647bb94..3d6d685 100644 (file)
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -20,7 +20,7 @@
 
 """Instance related commands"""
 
 
 """Instance related commands"""
 

-# pylint: disable-msg=W0401,W0614,C0103
+# pylint: disable=W0401,W0614,C0103

 # W0401: Wildcard import ganeti.cli
 # W0614: Unused import %s from wildcard import (since we need cli)
 # C0103: Invalid name gnt-instance
 # W0401: Wildcard import ganeti.cli
 # W0614: Unused import %s from wildcard import (since we need cli)
 # C0103: Invalid name gnt-instance

@@ -87,7 +87,7 @@ def _ExpandMultiNames(mode, names, client=None):
   @raise errors.OpPrereqError: for invalid input parameters
 
   """
   @raise errors.OpPrereqError: for invalid input parameters
 
   """

-  # pylint: disable-msg=W0142
+  # pylint: disable=W0142

 
   if client is None:
     client = GetClient()
 
   if client is None:
     client = GetClient()

@@ -322,7 +322,7 @@ def BatchCreate(opts, args):
   json_filename = args[0]
   try:
     instance_data = simplejson.loads(utils.ReadFile(json_filename))
   json_filename = args[0]
   try:
     instance_data = simplejson.loads(utils.ReadFile(json_filename))

-  except Exception, err: # pylint: disable-msg=W0703
+  except Exception, err: # pylint: disable=W0703

     ToStderr("Can't parse the instance definition file: %s" % str(err))
     return 1
 
     ToStderr("Can't parse the instance definition file: %s" % str(err))
     return 1
 

@@ -335,7 +335,7 @@ def BatchCreate(opts, args):
   # Iterate over the instances and do:
   #  * Populate the specs with default value
   #  * Validate the instance specs
   # Iterate over the instances and do:
   #  * Populate the specs with default value
   #  * Validate the instance specs

-  i_names = utils.NiceSort(instance_data.keys()) # pylint: disable-msg=E1103
+  i_names = utils.NiceSort(instance_data.keys()) # pylint: disable=E1103

   for name in i_names:
     specs = instance_data[name]
     specs = _PopulateWithDefaults(specs)
   for name in i_names:
     specs = instance_data[name]
     specs = _PopulateWithDefaults(specs)

@@ -1119,13 +1119,13 @@ def _FormatList(buf, data, indent_level):
                  if isinstance(elem, tuple)] or [0])
   for elem in data:
     if isinstance(elem, basestring):
                  if isinstance(elem, tuple)] or [0])
   for elem in data:
     if isinstance(elem, basestring):

-      buf.write("%*s%s\n" % (2*indent_level, "", elem))
+      buf.write("%*s%s\n" % (2 * indent_level, "", elem))

     elif isinstance(elem, tuple):
       key, value = elem
       spacer = "%*s" % (max_tlen - len(key), "")
     elif isinstance(elem, tuple):
       key, value = elem
       spacer = "%*s" % (max_tlen - len(key), "")

-      buf.write("%*s%s:%s %s\n" % (2*indent_level, "", key, spacer, value))
+      buf.write("%*s%s:%s %s\n" % (2 * indent_level, "", key, spacer, value))

     elif isinstance(elem, list):
     elif isinstance(elem, list):

-      _FormatList(buf, elem, indent_level+1)
+      _FormatList(buf, elem, indent_level + 1)

 
 
 def ShowInstanceConfig(opts, args):
 
 
 def ShowInstanceConfig(opts, args):

@@ -1179,7 +1179,7 @@ def ShowInstanceConfig(opts, args):
     buf.write("  Operating system: %s\n" % instance["os"])
     FormatParameterDict(buf, instance["os_instance"], instance["os_actual"],
                         level=2)
     buf.write("  Operating system: %s\n" % instance["os"])
     FormatParameterDict(buf, instance["os_instance"], instance["os_actual"],
                         level=2)

-    if instance.has_key("network_port"):
+    if "network_port" in instance:

       buf.write("  Allocated network port: %s\n" %
                 compat.TryToRoman(instance["network_port"],
                                   convert=opts.roman_integers))
       buf.write("  Allocated network port: %s\n" %
                 compat.TryToRoman(instance["network_port"],
                                   convert=opts.roman_integers))