[blivet:master+? 8/9] Remove now useless imports, constants, functions.

mulhern amulhern at redhat.com
Thu Oct 23 17:57:08 UTC 2014


Update tests appropriately.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/size.py     | 20 --------------------
 tests/size_test.py |  4 ++--
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/blivet/size.py b/blivet/size.py
index 12a1102..70cd2d0 100644
--- a/blivet/size.py
+++ b/blivet/size.py
@@ -19,7 +19,6 @@
 #
 # Red Hat Author(s): David Cantrell <dcantrell at redhat.com>
 
-import itertools
 import re
 import string
 import locale
@@ -71,9 +70,6 @@ _BINARY_PREFIXES = [
 # Empty prefix works both for decimal and binary
 _EMPTY_PREFIX = _Prefix(1, b"", b"")
 
-_BYTES = [N_(b'B'), N_(b'b'), N_(b'byte'), N_(b'bytes')]
-_PREFIXES = _BINARY_PREFIXES + _DECIMAL_PREFIXES
-
 def getSpecifiers(units, xlate=False):
     """ Get the valid units specifiers for units.
 
@@ -87,22 +83,6 @@ def getSpecifiers(units, xlate=False):
             return _makeSpecs(prefix, abbr, xlate)
     return None
 
-# Translated versions of the byte and prefix arrays as lazy comprehensions
-def _xlated_bytes():
-    return (_(b) for b in _BYTES)
-
-def _xlated_prefix(p):
-    return _Prefix(p.factor, _(p.prefix), _(p.abbr))
-
-def _xlated_binary_prefixes():
-    return (_xlated_prefix(p) for p in _BINARY_PREFIXES)
-
-def _xlated_decimal_prefixes():
-    return (_xlated_prefix(p) for p in _DECIMAL_PREFIXES)
-
-def _xlated_prefixes():
-    return itertools.chain(_xlated_binary_prefixes(), _xlated_decimal_prefixes())
-
 if six.PY2:
     _ASCIIlower_table = string.maketrans(string.ascii_uppercase, string.ascii_lowercase) # pylint: disable=no-member
 else:
diff --git a/tests/size_test.py b/tests/size_test.py
index b577c70..a624aa8 100644
--- a/tests/size_test.py
+++ b/tests/size_test.py
@@ -28,7 +28,7 @@ from decimal import Decimal
 import six
 
 from blivet.errors import SizePlacesError
-from blivet.size import Size, _PREFIXES
+from blivet.size import Size, _EMPTY_PREFIX, _BINARY_PREFIXES, _DECIMAL_PREFIXES
 
 if six.PY3:
     long = int # pylint: disable=redefined-builtin
@@ -71,7 +71,7 @@ class SizeTestCase(unittest.TestCase):
         numbytes = long(47)
         self._prefixTestHelper(numbytes, 1, None, None)
 
-        for factor, prefix, abbr in _PREFIXES:
+        for factor, prefix, abbr in [_EMPTY_PREFIX] + _BINARY_PREFIXES + _DECIMAL_PREFIXES:
             self._prefixTestHelper(numbytes, factor, prefix, abbr)
 
     def testHumanReadable(self):
-- 
1.9.3



More information about the anaconda-patches mailing list