Merge "Replace reduce and unichr , these are no longer available in py3"

swift/common/splice.py

@@ -86,7 +86,7 @@ class Tee(object):
             raise EnvironmentError('tee not available')
 
         if not isinstance(flags, six.integer_types):
-            c_flags = reduce(operator.or_, flags, 0)
+            c_flags = six.moves.reduce(operator.or_, flags, 0)
         else:
             c_flags = flags
 
@@ -177,7 +177,7 @@ class Splice(object):
             raise EnvironmentError('splice not available')
 
         if not isinstance(flags, six.integer_types):
-            c_flags = reduce(operator.or_, flags, 0)
+            c_flags = six.moves.reduce(operator.or_, flags, 0)
         else:
             c_flags = flags
 

swift/common/storage_policy.py

@@ -15,6 +15,7 @@ from ConfigParser import ConfigParser
 import os
 import string
 import textwrap
+import six
 
 from swift.common.utils import (
     config_true_value, SWIFT_CONF_FILE, whataremyips)
@@ -76,7 +77,8 @@ class BindPortsCache(object):
                 # the first one we notice.
 
         # Return the requested set of ports from our (now-freshened) cache
-        return reduce(set.union, self.portsets_by_ring_path.values(), set())
+        return six.moves.reduce(set.union,
+                                self.portsets_by_ring_path.values(), set())
 
 
 class PolicyError(ValueError):

test/unit/common/test_internal_client.py

@@ -22,6 +22,7 @@ import zlib
 from textwrap import dedent
 import os
 
+import six
 from six.moves import range
 from test.unit import FakeLogger
 import eventlet
@@ -39,7 +40,7 @@ def not_sleep(seconds):
 
 
 def unicode_string(start, length):
-    return u''.join([unichr(x) for x in range(start, start + length)])
+    return u''.join([six.unichr(x) for x in range(start, start + length)])
 
 
 def path_parts():