Start a branch to provide Distutils2 for Python 3.

This codebase is compatible with 3.1, 3.2 and 3.3.  It was converted with 2to3
and a semi-automated diff/merge with packaging in 3.3 to fix some idioms.
We?ve now come full circle from 2.x to 3.x to 2.x to 3.x again :)

Starting from now, contributors can make patches for packaging (preferred, as
the stdlib?s regrtest is very useful), distutils2 or distutils-python3, and
we?ll make patches flow between versions.

1 files changed, 19 insertions, 20 deletions

diff --git a/distutils2/tests/test_command_register.py b/distutils2/tests/test_command_register.py
index 85c3535..46ee2b1 100644
--- a/distutils2/tests/test_command_register.py
+++ b/distutils2/tests/test_command_register.py
@@ -1,8 +1,10 @@
-# encoding: utf-8
 """Tests for distutils2.command.register."""
 import os
 import getpass
-import urllib2
+import urllib.request
+import urllib.error
+import urllib.parse
+
 try:
     import docutils
     DOCUTILS_SUPPORT = True
@@ -36,7 +38,7 @@ password:password
 """
 
 
-class Inputs(object):
+class Inputs:
     """Fakes user inputs."""
     def __init__(self, *answers):
         self.answers = answers
@@ -49,7 +51,7 @@ class Inputs(object):
             self.index += 1
 
 
-class FakeOpener(object):
+class FakeOpener:
     """Fakes a PyPI server"""
     def __init__(self):
         self.reqs = []
@@ -85,12 +87,12 @@ class RegisterTestCase(support.TempdirManager,
             return 'password'
 
         getpass.getpass = _getpass
-        self.old_opener = urllib2.build_opener
-        self.conn = urllib2.build_opener = FakeOpener()
+        self.old_opener = urllib.request.build_opener
+        self.conn = urllib.request.build_opener = FakeOpener()
 
     def tearDown(self):
         getpass.getpass = self._old_getpass
-        urllib2.build_opener = self.old_opener
+        urllib.request.build_opener = self.old_opener
         if hasattr(register_module, 'input'):
             del register_module.input
         super(RegisterTestCase, self).tearDown()
@@ -121,7 +123,7 @@ class RegisterTestCase(support.TempdirManager,
         # Password : 'password'
         # Save your login (y/N)? : 'y'
         inputs = Inputs('1', 'tarek', 'y')
-        register_module.raw_input = inputs
+        register_module.input = inputs
         cmd.ensure_finalized()
         cmd.run()
 
@@ -129,11 +131,8 @@ class RegisterTestCase(support.TempdirManager,
         self.assertTrue(os.path.exists(self.rc))
 
         # with the content similar to WANTED_PYPIRC
-        fp = open(self.rc)
-        try:
+        with open(self.rc) as fp:
             content = fp.read()
-        finally:
-            fp.close()
         self.assertEqual(content, WANTED_PYPIRC)
 
         # now let's make sure the .pypirc file generated
@@ -153,7 +152,7 @@ class RegisterTestCase(support.TempdirManager,
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
         self.assertEqual(req2['Content-length'], req1['Content-length'])
-        self.assertIn('xxx', self.conn.reqs[1].data)
+        self.assertIn(b'xxx', self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
 
@@ -171,7 +170,7 @@ class RegisterTestCase(support.TempdirManager,
         # this test runs choice 2
         cmd = self._get_cmd()
         inputs = Inputs('2', 'tarek', 'tarek@ziade.org')
-        register_module.raw_input = inputs
+        register_module.input = inputs
         # let's run the command
         # FIXME does this send a real request? use a mock server
         cmd.ensure_finalized()
@@ -182,13 +181,13 @@ class RegisterTestCase(support.TempdirManager,
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEqual(headers['Content-length'], '628')
-        self.assertIn('tarek', req.data)
+        self.assertIn(b'tarek', req.data)
 
     def test_password_reset(self):
         # this test runs choice 3
         cmd = self._get_cmd()
         inputs = Inputs('3', 'tarek@ziade.org')
-        register_module.raw_input = inputs
+        register_module.input = inputs
         cmd.ensure_finalized()
         cmd.run()
 
@@ -197,7 +196,7 @@ class RegisterTestCase(support.TempdirManager,
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEqual(headers['Content-length'], '298')
-        self.assertIn('tarek', req.data)
+        self.assertIn(b'tarek', req.data)
 
     @unittest.skipUnless(DOCUTILS_SUPPORT, 'needs docutils')
     def test_strict(self):
@@ -211,7 +210,7 @@ class RegisterTestCase(support.TempdirManager,
         cmd.ensure_finalized()
         cmd.strict = True
         inputs = Inputs('1', 'tarek', 'y')
-        register_module.raw_input = inputs
+        register_module.input = inputs
         self.assertRaises(PackagingSetupError, cmd.run)
 
         # metadata is OK but long_description is broken
@@ -232,7 +231,7 @@ class RegisterTestCase(support.TempdirManager,
         cmd.ensure_finalized()
         cmd.strict = True
         inputs = Inputs('1', 'tarek', 'y')
-        register_module.raw_input = inputs
+        register_module.input = inputs
         cmd.ensure_finalized()
         cmd.run()
 
@@ -240,7 +239,7 @@ class RegisterTestCase(support.TempdirManager,
         cmd = self._get_cmd()
         cmd.ensure_finalized()
         inputs = Inputs('1', 'tarek', 'y')
-        register_module.raw_input = inputs
+        register_module.input = inputs
         cmd.ensure_finalized()
         cmd.run()