Fix windows tests, spacing.

Author: barneygale

Lib/test/test_nturl2path.py

@@ -2,8 +2,8 @@
 
 from test.support import warnings_helper
 
-nturl2path = warnings_helper.import_deprecated("nturl2path")
 
+nturl2path = warnings_helper.import_deprecated("nturl2path")
 
 
 class NTURL2PathTest(unittest.TestCase):
@@ -103,6 +103,5 @@ def test_url2pathname(self):
             self.assertEqual(fn(nturl2path.pathname2url(path)), path)
 
 
-
 if __name__ == '__main__':
     unittest.main()

Lib/test/test_urllib2.py

@@ -44,10 +44,6 @@ def test___all__(self):
             context = {}
             exec('from urllib.%s import *' % module, context)
             del context['__builtins__']
-            if module == 'request' and os.name == 'nt':
-                u, p = context.pop('url2pathname'), context.pop('pathname2url')
-                self.assertEqual(u.__module__, 'nturl2path')
-                self.assertEqual(p.__module__, 'nturl2path')
             for k, v in context.items():
                 self.assertEqual(v.__module__, 'urllib.%s' % module,
                     "%r is exposed in 'urllib.%s' but defined in %r" %

Lib/urllib/request.py

@@ -1646,7 +1646,6 @@ def data_open(self, req):
 
 # Code move from the old urllib module
 
-# Helper for non-unix systems
 def url2pathname(url):
     """OS-specific conversion from a relative URL of the 'file' scheme
     to a file system path; not recommended for general use."""