OpInstanceSetParams: Merge {off,on}line_inst parameters

[ganeti-local] / lib / compat.py

diff --git a/lib/compat.py b/lib/compat.py
index 9079920..6515af1 100644 (file)
--- a/lib/compat.py
+++ b/lib/compat.py
@@ -27,13 +27,13 @@ import itertools
 import operator
 
 try:
 import operator
 
 try:

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

   import functools
 except ImportError:
   functools = None
 
 try:
   import functools
 except ImportError:
   functools = None
 
 try:

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

   import roman
 except ImportError:
   roman = None
   import roman
 except ImportError:
   roman = None

@@ -45,11 +45,10 @@ except ImportError:
 # modules (hmac, for example) which have changed their behavior as well from
 # one version to the other.
 try:
 # modules (hmac, for example) which have changed their behavior as well from
 # one version to the other.
 try:

-  # pylint: disable-msg=F0401
+  # Yes, these don't always exist, that's why we're testing

   # Yes, we're not using the imports in this module.
   # Yes, we're not using the imports in this module.

-  # pylint: disable-msg=W0611
-  from hashlib import md5 as md5_hash
-  from hashlib import sha1 as sha1_hash
+  from hashlib import md5 as md5_hash # pylint: disable=W0611,E0611,F0401
+  from hashlib import sha1 as sha1_hash # pylint: disable=W0611,E0611,F0401

   # this additional version is needed for compatibility with the hmac module
   sha1 = sha1_hash
 except ImportError:
   # this additional version is needed for compatibility with the hmac module
   sha1 = sha1_hash
 except ImportError:

@@ -78,21 +77,21 @@ def _any(seq):
 
 
 try:
 
 
 try:

-  # pylint: disable-msg=E0601
-  # pylint: disable-msg=W0622
+  # pylint: disable=E0601
+  # pylint: disable=W0622

   all = all
 except NameError:
   all = _all
 
 try:
   all = all
 except NameError:
   all = _all
 
 try:

-  # pylint: disable-msg=E0601
-  # pylint: disable-msg=W0622
+  # pylint: disable=E0601
+  # pylint: disable=W0622

   any = any
 except NameError:
   any = _any
 
 
   any = any
 except NameError:
   any = _any
 
 

-def partition(seq, pred=bool): # pylint: disable-msg=W0622
+def partition(seq, pred=bool): # pylint: disable=W0622

   """Partition a list in two, based on the given predicate.
 
   """
   """Partition a list in two, based on the given predicate.
 
   """

@@ -102,7 +101,7 @@ def partition(seq, pred=bool): # pylint: disable-msg=W0622
 
 # Even though we're using Python's built-in "partial" function if available,
 # this one is always defined for testing.
 
 # Even though we're using Python's built-in "partial" function if available,
 # this one is always defined for testing.

-def _partial(func, *args, **keywords): # pylint: disable-msg=W0622
+def _partial(func, *args, **keywords): # pylint: disable=W0622

   """Decorator with partial application of arguments and keywords.
 
   This function was copied from Python's documentation.
   """Decorator with partial application of arguments and keywords.
 
   This function was copied from Python's documentation.

@@ -111,7 +110,7 @@ def _partial(func, *args, **keywords): # pylint: disable-msg=W0622
   def newfunc(*fargs, **fkeywords):
     newkeywords = keywords.copy()
     newkeywords.update(fkeywords)
   def newfunc(*fargs, **fkeywords):
     newkeywords = keywords.copy()
     newkeywords.update(fkeywords)

-    return func(*(args + fargs), **newkeywords) # pylint: disable-msg=W0142
+    return func(*(args + fargs), **newkeywords) # pylint: disable=W0142

 
   newfunc.func = func
   newfunc.args = args
 
   newfunc.func = func
   newfunc.args = args