Merge "python3: Use six everywhere"

doc/source/conf.py

@@ -24,8 +24,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'pbr'
-copyright = u'2013, OpenStack Foundation'
+project = 'pbr'
+copyright = '2013, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -54,8 +54,8 @@ htmlhelp_basename = '%sdoc' % project
 latex_documents = [
     ('index',
      '%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Foundation', 'manual'),
+     '%s Documentation' % project,
+     'OpenStack Foundation', 'manual'),
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.

pbr/tests/test_version.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import StringIO
 import sys
 
+from d2to1.extern import six
 from oslo.config import cfg
 
 from pbr import tests
@@ -47,7 +47,7 @@ class DeferredVersionTestCase(tests.BaseTestCase):
 
         deferred_string = MyVersionInfo("openstack")\
             .cached_version_string()
-        self.stubs.Set(sys, 'stderr', StringIO.StringIO())
+        self.stubs.Set(sys, 'stderr', six.StringIO())
         self.assertRaises(SystemExit,
                           self.conf, ['--version'],
                           project="project",
@@ -66,7 +66,7 @@ class DeferredVersionTestCase(tests.BaseTestCase):
             .cached_version_string()
 
         for i in range(50):
-            self.stubs.Set(sys, 'stderr', StringIO.StringIO())
+            self.stubs.Set(sys, 'stderr', six.StringIO())
             self.assertRaises(SystemExit,
                               self.conf, ['--version'],
                               project="project",