[blivet:master+? 2/5] Make _lowerASCII() python 3 compatible and add a method header.

mulhern amulhern at redhat.com
Fri Oct 24 18:39:38 UTC 2014


Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/size.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/blivet/size.py b/blivet/size.py
index 3b0c0b0..d0eecb6 100644
--- a/blivet/size.py
+++ b/blivet/size.py
@@ -90,10 +90,22 @@ def _xlated_decimal_prefixes():
 def _xlated_prefixes():
     return itertools.chain(_xlated_binary_prefixes(), _xlated_decimal_prefixes())
 
-_ASCIIlower_table = string.maketrans(string.ascii_uppercase, string.ascii_lowercase)
+if six.PY2:
+    _ASCIIlower_table = string.maketrans(string.ascii_uppercase, string.ascii_lowercase) # pylint: disable=no-member
+else:
+    _ASCIIlower_table = str.maketrans(string.ascii_uppercase, string.ascii_lowercase) # pylint: disable=no-member
+
 def _lowerASCII(s):
-    """Convert a string to lowercase using only ASCII character definitions."""
-    return string.translate(s, _ASCIIlower_table)
+    """Convert a string to lowercase using only ASCII character definitions.
+
+       :param str s: string to convert
+       :returns: lower-cased string
+       :rtype: str
+    """
+    if six.PY2:
+        return string.translate(s, _ASCIIlower_table) # pylint: disable=no-member
+    else:
+        return str.translate(s, _ASCIIlower_table) # pylint: disable=no-member
 
 def _makeSpecs(prefix, abbr, xlate):
     """ Internal method used to generate a list of specifiers. """
-- 
1.9.3



More information about the anaconda-patches mailing list