[Python-checkins] distutils2: Fix backport changesets part 2: tests
eric.araujo
python-checkins at python.org
Mon Sep 19 15:12:39 CEST 2011
http://hg.python.org/distutils2/rev/0439c5abecf2
changeset: 1149:0439c5abecf2
user: Éric Araujo <merwok at netwok.org>
date: Sun Sep 18 20:23:12 2011 +0200
summary:
Fix backport changesets part 2: tests
files:
distutils2/_backport/tests/test_shutil.py | 3 +-
distutils2/_backport/tests/test_sysconfig.py | 2 +-
distutils2/tests/__init__.py | 18 +-
distutils2/tests/__main__.py | 2 +-
distutils2/tests/pypi_server.py | 20 +-
distutils2/tests/support.py | 88 +------
distutils2/tests/test_command_build_ext.py | 27 +-
distutils2/tests/test_command_build_py.py | 3 +-
distutils2/tests/test_command_build_scripts.py | 14 +-
distutils2/tests/test_command_config.py | 6 +-
distutils2/tests/test_command_install_data.py | 1 +
distutils2/tests/test_command_install_dist.py | 17 +-
distutils2/tests/test_command_install_distinfo.py | 41 ++-
distutils2/tests/test_command_install_lib.py | 12 +-
distutils2/tests/test_command_install_scripts.py | 6 +-
distutils2/tests/test_command_register.py | 9 +-
distutils2/tests/test_command_sdist.py | 44 ++-
distutils2/tests/test_command_upload.py | 26 +-
distutils2/tests/test_command_upload_docs.py | 63 ++---
distutils2/tests/test_compiler.py | 2 +-
distutils2/tests/test_config.py | 10 +-
distutils2/tests/test_create.py | 51 ++-
distutils2/tests/test_database.py | 107 +++++----
distutils2/tests/test_depgraph.py | 22 +-
distutils2/tests/test_dist.py | 33 +-
distutils2/tests/test_install.py | 2 +-
distutils2/tests/test_manifest.py | 12 +-
distutils2/tests/test_markers.py | 2 +-
distutils2/tests/test_metadata.py | 47 ++-
distutils2/tests/test_mixin2to3.py | 36 ++-
distutils2/tests/test_msvc9compiler.py | 14 +-
distutils2/tests/test_pypi_server.py | 37 +-
distutils2/tests/test_pypi_simple.py | 36 +-
distutils2/tests/test_pypi_xmlrpc.py | 3 +-
distutils2/tests/test_run.py | 29 +--
distutils2/tests/test_util.py | 58 ++--
36 files changed, 452 insertions(+), 451 deletions(-)
diff --git a/distutils2/_backport/tests/test_shutil.py b/distutils2/_backport/tests/test_shutil.py
--- a/distutils2/_backport/tests/test_shutil.py
+++ b/distutils2/_backport/tests/test_shutil.py
@@ -14,7 +14,8 @@
register_unpack_format, unregister_unpack_format, get_unpack_formats,
Error, RegistryError)
-from distutils2.tests import unittest, support, TESTFN
+from distutils2.tests import unittest, support
+from test.test_support import TESTFN
try:
import bz2
diff --git a/distutils2/_backport/tests/test_sysconfig.py b/distutils2/_backport/tests/test_sysconfig.py
--- a/distutils2/_backport/tests/test_sysconfig.py
+++ b/distutils2/_backport/tests/test_sysconfig.py
@@ -14,7 +14,7 @@
get_config_var, get_config_vars, get_path, get_paths, get_platform,
get_scheme_names, _main, _SCHEMES)
-from distutils2.tests import unittest, TESTFN, unlink
+from distutils2.tests import unittest
from distutils2.tests.support import EnvironRestorer
from test.test_support import TESTFN, unlink
diff --git a/distutils2/tests/__init__.py b/distutils2/tests/__init__.py
--- a/distutils2/tests/__init__.py
+++ b/distutils2/tests/__init__.py
@@ -6,17 +6,15 @@
to return an initialized unittest.TestSuite instance.
Utility code is included in distutils2.tests.support.
+
+Always import unittest from this module, it will be the right version
+standard library for packaging tests and unittest2 for distutils2 tests.
"""
-# Put this text back for the backport
-#Always import unittest from this module, it will be the right version
-#(standard library unittest for 3.2 and higher, third-party unittest2
-#elease for older versions).
-
import os
import sys
import unittest2 as unittest
-from distutils2.tests.support import TESTFN
+from StringIO import StringIO
# XXX move helpers to support, add tests for them, remove things that
# duplicate test.support (or keep them for the backport; needs thinking)
@@ -115,7 +113,6 @@
def captured_stdout(func, *args, **kw):
- from StringIO import StringIO
orig_stdout = getattr(sys, 'stdout')
setattr(sys, 'stdout', StringIO())
try:
@@ -131,10 +128,3 @@
del sys.modules[name]
except KeyError:
pass
-
-
-def unlink(filename):
- try:
- os.unlink(filename)
- except OSError:
- pass
diff --git a/distutils2/tests/__main__.py b/distutils2/tests/__main__.py
--- a/distutils2/tests/__main__.py
+++ b/distutils2/tests/__main__.py
@@ -1,4 +1,4 @@
-"""Packaging test suite runner."""
+"""Distutils2 test suite runner."""
# Ripped from importlib tests, thanks Brett!
diff --git a/distutils2/tests/pypi_server.py b/distutils2/tests/pypi_server.py
--- a/distutils2/tests/pypi_server.py
+++ b/distutils2/tests/pypi_server.py
@@ -225,14 +225,18 @@
relative_path += "index.html"
if relative_path.endswith('.tar.gz'):
- fp = open(fs_path + relative_path, 'br')
- data = fp.read()
- fp.close()
+ file = open(fs_path + relative_path, 'rb')
+ try:
+ data = file.read()
+ finally:
+ file.close()
headers = [('Content-type', 'application/x-gtar')]
else:
- fp = open(fs_path + relative_path)
- data = fp.read().encode()
- fp.close()
+ file = open(fs_path + relative_path)
+ try:
+ data = file.read().encode()
+ finally:
+ file.close()
headers = [('Content-type', 'text/html')]
headers.append(('Content-Length', len(data)))
@@ -268,8 +272,8 @@
self.send_header(header, value)
self.end_headers()
- if type(data) is str:
- data = data.encode()
+ if isinstance(data, unicode):
+ data = data.encode('utf-8')
self.wfile.write(data)
diff --git a/distutils2/tests/support.py b/distutils2/tests/support.py
--- a/distutils2/tests/support.py
+++ b/distutils2/tests/support.py
@@ -1,5 +1,8 @@
"""Support code for distutils2 test cases.
+*This module should not be considered public: its content and API may
+change in incompatible ways.*
+
A few helper classes are provided: LoggingCatcher, TempdirManager and
EnvironRestorer. They are written to be used as mixins::
@@ -7,6 +10,7 @@
from distutils2.tests.support import LoggingCatcher
class SomeTestCase(LoggingCatcher, unittest.TestCase):
+ ...
If you need to define a setUp method on your test class, you have to
call the mixin class' setUp method or it won't work (same thing for
@@ -14,7 +18,7 @@
def setUp(self):
super(SomeTestCase, self).setUp()
- ... # other setup code
+ ... # other setup code
Also provided is a DummyCommand class, useful to mock commands in the
tests of another command that needs them, a create_distribution function
@@ -25,15 +29,16 @@
and a skip_unless_symlink decorator.
Each class or function has a docstring to explain its purpose and usage.
+Existing tests should also be used as examples.
"""
+import os
+import sys
import codecs
-import os
import shutil
import logging
import logging.handlers
import subprocess
-import sys
import weakref
import tempfile
try:
@@ -172,8 +177,10 @@
if isinstance(path, (list, tuple)):
path = os.path.join(*path)
f = codecs.open(path, 'w', encoding=encoding)
- f.write(content)
- f.close()
+ try:
+ f.write(content)
+ finally:
+ f.close()
def create_dist(self, **kw):
"""Create a stub distribution object and files.
@@ -244,6 +251,8 @@
Useful for mocking one dependency command in the tests for another
command, see e.g. the dummy build command in test_build_scripts.
"""
+ # XXX does not work with dist.get_reinitialized_command, which typechecks
+ # and wants a finalized attribute
def __init__(self, **kwargs):
for kw, val in kwargs.items():
@@ -284,74 +293,17 @@
return _wrap
-#try:
-# from test.support import skip_unless_symlink
-#except ImportError:
-# skip_unless_symlink = unittest.skip(
-# 'requires test.support.skip_unless_symlink')
+try:
+ from test.test_support import skip_unless_symlink
+except ImportError:
+ skip_unless_symlink = unittest.skip(
+ 'requires test.support.skip_unless_symlink')
-if os.name == 'java':
- # Jython disallows @ in module names
- TESTFN = '$test'
-else:
- TESTFN = '@test'
-
-# Disambiguate TESTFN for parallel testing, while letting it remain a valid
-# module name.
-TESTFN = "%s_%s_tmp" % (TESTFN, os.getpid())
-
-
-# TESTFN_UNICODE is a non-ascii filename
-TESTFN_UNICODE = TESTFN + "-\xe0\xf2\u0258\u0141\u011f"
-if sys.platform == 'darwin':
- # In Mac OS X's VFS API file names are, by definition, canonically
- # decomposed Unicode, encoded using UTF-8. See QA1173:
- # http://developer.apple.com/mac/library/qa/qa2001/qa1173.html
- import unicodedata
- TESTFN_UNICODE = unicodedata.normalize('NFD', TESTFN_UNICODE)
-TESTFN_ENCODING = sys.getfilesystemencoding()
-
-# TESTFN_UNENCODABLE is a filename (str type) that should *not* be able to be
-# encoded by the filesystem encoding (in strict mode). It can be None if we
-# cannot generate such filename.
-TESTFN_UNENCODABLE = None
-if os.name in ('nt', 'ce'):
- # skip win32s (0) or Windows 9x/ME (1)
- if sys.getwindowsversion().platform >= 2:
- # Different kinds of characters from various languages to minimize the
- # probability that the whole name is encodable to MBCS (issue #9819)
- TESTFN_UNENCODABLE = TESTFN + "-\u5171\u0141\u2661\u0363\uDC80"
- try:
- TESTFN_UNENCODABLE.encode(TESTFN_ENCODING)
- except UnicodeEncodeError:
- pass
- else:
- print ('WARNING: The filename %r CAN be encoded by the filesystem encoding (%s). '
- 'Unicode filename tests may not be effective'
- % (TESTFN_UNENCODABLE, TESTFN_ENCODING))
- TESTFN_UNENCODABLE = None
-# Mac OS X denies unencodable filenames (invalid utf-8)
-elif sys.platform != 'darwin':
- try:
- # ascii and utf-8 cannot encode the byte 0xff
- '\xff'.decode(TESTFN_ENCODING)
- except UnicodeDecodeError:
- # 0xff will be encoded using the surrogate character u+DCFF
- try:
- TESTFN_UNENCODABLE = TESTFN \
- + '-\xff'.decode(TESTFN_ENCODING, 'surrogateescape')
- except LookupError:
- pass
- else:
- # File system encoding (eg. ISO-8859-* encodings) can encode
- # the byte 0xff. Skip some unicode filename tests.
- pass
def unlink(filename):
try:
os.unlink(filename)
- except OSError:
- error = sys.exc_info()[1]
+ except OSError, error:
# The filename need not exist.
if error.errno not in (errno.ENOENT, errno.ENOTDIR):
raise
diff --git a/distutils2/tests/test_command_build_ext.py b/distutils2/tests/test_command_build_ext.py
--- a/distutils2/tests/test_command_build_ext.py
+++ b/distutils2/tests/test_command_build_ext.py
@@ -8,7 +8,7 @@
from distutils2._backport.sysconfig import _CONFIG_VARS
from distutils2.dist import Distribution
from distutils2.errors import (UnknownFileError, CompileError,
- PackagingPlatformError)
+ PackagingPlatformError)
from distutils2.command.build_ext import build_ext
from distutils2.compiler.extension import Extension
from distutils2.tests.support import assert_python_ok
@@ -30,8 +30,6 @@
support.LoggingCatcher,
unittest.TestCase):
def setUp(self):
- # Create a simple test environment
- # Note that we're making changes to sys.path
super(BuildExtTestCase, self).setUp()
self.tmp_dir = self.mkdtemp()
filename = _get_source_filename()
@@ -40,13 +38,10 @@
if sys.version > "2.6":
self.old_user_base = site.USER_BASE
site.USER_BASE = self.mkdtemp()
- build_ext.USER_BASE = site.USER_BASE
def tearDown(self):
- # Get everything back to normal
if sys.version > "2.6":
site.USER_BASE = self.old_user_base
- build_ext.USER_BASE = self.old_user_base
super(BuildExtTestCase, self).tearDown()
@@ -94,10 +89,8 @@
try:
cmd.ensure_finalized()
cmd.run()
- except:
+ finally:
sys.stdout = old_stdout
- raise
- sys.stdout = old_stdout
code = """if 1:
import sys
@@ -127,18 +120,14 @@
old_var = _CONFIG_VARS.get('Py_ENABLE_SHARED')
_CONFIG_VARS['Py_ENABLE_SHARED'] = 1
- def cleanup():
+ try:
+ cmd.ensure_finalized()
+ finally:
sys.platform = old
if old_var is None:
del _CONFIG_VARS['Py_ENABLE_SHARED']
else:
_CONFIG_VARS['Py_ENABLE_SHARED'] = old_var
- try:
- cmd.ensure_finalized()
- except:
- cleanup()
- raise
- cleanup()
# make sure we get some library dirs under solaris
self.assertGreater(len(cmd.library_dirs), 0)
@@ -415,7 +404,8 @@
deptarget_c = os.path.join(self.tmp_dir, 'deptargetmodule.c')
fp = open(deptarget_c, 'w')
- fp.write(textwrap.dedent('''\
+ try:
+ fp.write(textwrap.dedent('''\
#include <AvailabilityMacros.h>
int dummy;
@@ -426,7 +416,8 @@
#endif
''' % operator))
- fp.close()
+ finally:
+ fp.close()
# get the deployment target that the interpreter was built with
target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
diff --git a/distutils2/tests/test_command_build_py.py b/distutils2/tests/test_command_build_py.py
--- a/distutils2/tests/test_command_build_py.py
+++ b/distutils2/tests/test_command_build_py.py
@@ -61,7 +61,7 @@
self.assertIn("__init__.py", files)
self.assertIn("README.txt", files)
# XXX even with -O, distutils writes pyc, not pyo; bug?
- if hasattr(sys , 'dont_write_bytecode'):
+ if getattr(sys , 'dont_write_bytecode', False):
self.assertNotIn("__init__.pyc", files)
else:
self.assertIn("__init__.pyc", files)
@@ -81,6 +81,7 @@
os.chdir(sources)
old_stdout = sys.stdout
+ #sys.stdout = StringIO.StringIO()
try:
dist = Distribution({"packages": ["pkg"],
diff --git a/distutils2/tests/test_command_build_scripts.py b/distutils2/tests/test_command_build_scripts.py
--- a/distutils2/tests/test_command_build_scripts.py
+++ b/distutils2/tests/test_command_build_scripts.py
@@ -2,9 +2,10 @@
import os
import sys
-from distutils2._backport import sysconfig
from distutils2.dist import Distribution
from distutils2.command.build_scripts import build_scripts
+from distutils2._backport import sysconfig
+
from distutils2.tests import unittest, support
@@ -71,8 +72,10 @@
def write_script(self, dir, name, text):
f = open(os.path.join(dir, name), "w")
- f.write(text)
- f.close()
+ try:
+ f.write(text)
+ finally:
+ f.close()
def test_version_int(self):
source = self.mkdtemp()
@@ -94,12 +97,9 @@
sysconfig._CONFIG_VARS['VERSION'] = 4
try:
cmd.run()
- except:
+ finally:
if old is not None:
sysconfig._CONFIG_VARS['VERSION'] = old
- raise
- if old is not None:
- sysconfig._CONFIG_VARS['VERSION'] = old
built = os.listdir(target)
for name in expected:
diff --git a/distutils2/tests/test_command_config.py b/distutils2/tests/test_command_config.py
--- a/distutils2/tests/test_command_config.py
+++ b/distutils2/tests/test_command_config.py
@@ -14,8 +14,10 @@
def test_dump_file(self):
this_file = __file__.rstrip('co')
f = open(this_file)
- numlines = len(f.readlines())
- f.close()
+ try:
+ numlines = len(f.readlines())
+ finally:
+ f.close()
dump_file(this_file, 'I am the header')
diff --git a/distutils2/tests/test_command_install_data.py b/distutils2/tests/test_command_install_data.py
--- a/distutils2/tests/test_command_install_data.py
+++ b/distutils2/tests/test_command_install_data.py
@@ -35,6 +35,7 @@
two = os.path.join(pkg_dir, 'two')
self.write_file(two, 'xxx')
+ # FIXME this creates a literal \{inst2\} directory!
cmd.data_files = {one: '{inst}/one', two: '{inst2}/two'}
self.assertItemsEqual(cmd.get_inputs(), [one, two])
diff --git a/distutils2/tests/test_command_install_dist.py b/distutils2/tests/test_command_install_dist.py
--- a/distutils2/tests/test_command_install_dist.py
+++ b/distutils2/tests/test_command_install_dist.py
@@ -43,12 +43,9 @@
cmd = install_dist(dist)
cmd.home = destination
cmd.ensure_finalized()
- except:
+ finally:
_SCHEMES.set('posix_prefix', 'platinclude', old_posix_prefix)
_SCHEMES.set('posix_home', 'platinclude', old_posix_home)
- raise
- _SCHEMES.set('posix_prefix', 'platinclude', old_posix_prefix)
- _SCHEMES.set('posix_home', 'platinclude', old_posix_home)
self.assertEqual(cmd.install_base, destination)
self.assertEqual(cmd.install_platbase, destination)
@@ -88,17 +85,13 @@
self.old_expand = os.path.expanduser
os.path.expanduser = _expanduser
- def cleanup():
+ try:
+ # this is the actual test
+ self._test_user_site()
+ finally:
_CONFIG_VARS['userbase'] = self.old_user_base
_SCHEMES.set(scheme, 'purelib', self.old_user_site)
os.path.expanduser = self.old_expand
- try:
- # this is the actual test
- self._test_user_site()
- except:
- cleanup()
- raise
- cleanup()
def _test_user_site(self):
schemes = get_scheme_names()
diff --git a/distutils2/tests/test_command_install_distinfo.py b/distutils2/tests/test_command_install_distinfo.py
--- a/distutils2/tests/test_command_install_distinfo.py
+++ b/distutils2/tests/test_command_install_distinfo.py
@@ -58,14 +58,16 @@
self.checkLists(os.listdir(dist_info),
['METADATA', 'RECORD', 'REQUESTED', 'INSTALLER'])
fp = open(os.path.join(dist_info, 'INSTALLER'))
- content = fp.read()
- fp.close()
- self.assertEqual(content, 'distutils')
+ try:
+ self.assertEqual(fp.read(), 'distutils')
+ finally:
+ fp.close()
fp = open(os.path.join(dist_info, 'REQUESTED'))
- content = fp.read()
- fp.close()
- self.assertEqual(content, '')
+ try:
+ self.assertEqual(fp.read(), '')
+ finally:
+ fp.close()
meta_path = os.path.join(dist_info, 'METADATA')
self.assertTrue(Metadata(path=meta_path).check())
@@ -89,9 +91,10 @@
dist_info = os.path.join(install_dir, 'foo-1.0.dist-info')
fp = open(os.path.join(dist_info, 'INSTALLER'))
- content = fp.read()
- fp.close()
- self.assertEqual(content, 'bacon-python')
+ try:
+ self.assertEqual(fp.read(), 'bacon-python')
+ finally:
+ fp.close()
def test_requested(self):
pkg_dir, dist = self.create_dist(name='foo',
@@ -172,25 +175,29 @@
expected = []
for f in install.get_outputs():
- if (f.endswith('.pyc',) or f.endswith('.pyo') or f == os.path.join(
+ if (f.endswith('.pyc') or f.endswith('.pyo') or f == os.path.join(
install_dir, 'foo-1.0.dist-info', 'RECORD')):
expected.append([f, '', ''])
else:
size = os.path.getsize(f)
md5 = hashlib.md5()
fp = open(f, 'rb')
- md5.update(fp.read())
- fp.close()
+ try:
+ md5.update(fp.read())
+ finally:
+ fp.close()
hash = md5.hexdigest()
expected.append([f, hash, str(size)])
parsed = []
f = open(os.path.join(dist_info, 'RECORD'), 'r')
- reader = csv.reader(f, delimiter=',',
- lineterminator=os.linesep,
- quotechar='"')
- parsed = list(reader)
- f.close()
+ try:
+ reader = csv.reader(f, delimiter=',',
+ lineterminator=os.linesep,
+ quotechar='"')
+ parsed = list(reader)
+ finally:
+ f.close()
self.maxDiff = None
self.checkLists(parsed, expected)
diff --git a/distutils2/tests/test_command_install_lib.py b/distutils2/tests/test_command_install_lib.py
--- a/distutils2/tests/test_command_install_lib.py
+++ b/distutils2/tests/test_command_install_lib.py
@@ -7,13 +7,6 @@
from distutils2.compiler.extension import Extension
from distutils2.errors import PackagingOptionError
-try:
- no_bytecode = sys.dont_write_bytecode
- bytecode_support = True
-except AttributeError:
- no_bytecode = False
- bytecode_support = False
-
class InstallLibTestCase(support.TempdirManager,
support.LoggingCatcher,
@@ -40,7 +33,8 @@
cmd.finalize_options()
self.assertEqual(cmd.optimize, 2)
- @unittest.skipIf(no_bytecode, 'byte-compile not supported')
+ @unittest.skipIf(getattr(sys, 'dont_write_bytecode', False),
+ 'byte-compile disabled')
def test_byte_compile(self):
pkg_dir, dist = self.create_dist()
cmd = install_lib(dist)
@@ -89,7 +83,7 @@
# get_input should return 2 elements
self.assertEqual(len(cmd.get_inputs()), 2)
- @unittest.skipUnless(bytecode_support,
+ @unittest.skipUnless(hasattr(sys, 'dont_write_bytecode'),
'sys.dont_write_bytecode not supported')
def test_dont_write_bytecode(self):
# makes sure byte_compile is not used
diff --git a/distutils2/tests/test_command_install_scripts.py b/distutils2/tests/test_command_install_scripts.py
--- a/distutils2/tests/test_command_install_scripts.py
+++ b/distutils2/tests/test_command_install_scripts.py
@@ -39,8 +39,10 @@
def write_script(name, text):
expected.append(name)
f = open(os.path.join(source, name), "w")
- f.write(text)
- f.close()
+ try:
+ f.write(text)
+ finally:
+ f.close()
write_script("script1.py", ("#! /usr/bin/env python2.3\n"
"# bogus script w/ Python sh-bang\n"
diff --git a/distutils2/tests/test_command_register.py b/distutils2/tests/test_command_register.py
--- a/distutils2/tests/test_command_register.py
+++ b/distutils2/tests/test_command_register.py
@@ -1,3 +1,4 @@
+# encoding: utf-8
"""Tests for distutils2.command.register."""
import os
import getpass
@@ -129,8 +130,10 @@
# with the content similar to WANTED_PYPIRC
fp = open(self.rc)
- content = fp.read()
- fp.close()
+ try:
+ content = fp.read()
+ finally:
+ fp.close()
self.assertEqual(content, WANTED_PYPIRC)
# now let's make sure the .pypirc file generated
@@ -213,7 +216,7 @@
# metadata is OK but long_description is broken
metadata = {'home_page': 'xxx', 'author': 'xxx',
- 'author_email': '\xc3x\xc3x\xc3',
+ 'author_email': 'éxéxé',
'name': 'xxx', 'version': 'xxx',
'description': 'title\n==\n\ntext'}
diff --git a/distutils2/tests/test_command_sdist.py b/distutils2/tests/test_command_sdist.py
--- a/distutils2/tests/test_command_sdist.py
+++ b/distutils2/tests/test_command_sdist.py
@@ -214,8 +214,10 @@
# Checking the MANIFEST
fp = open(join(self.tmp_dir, 'MANIFEST'))
- manifest = fp.read()
- fp.close()
+ try:
+ manifest = fp.read()
+ finally:
+ fp.close()
self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
@requires_zlib
@@ -332,9 +334,11 @@
# Should produce four lines. Those lines are one comment, one default
# (README) and two package files.
f = open(cmd.manifest)
- manifest = [line.strip() for line in f.read().split('\n')
- if line.strip() != '']
- f.close()
+ try:
+ manifest = [line.strip() for line in f.read().split('\n')
+ if line.strip() != '']
+ finally:
+ f.close()
self.assertEqual(len(manifest), 3)
# Adding a file
@@ -348,9 +352,11 @@
cmd.run()
f = open(cmd.manifest)
- manifest2 = [line.strip() for line in f.read().split('\n')
- if line.strip() != '']
- f.close()
+ try:
+ manifest2 = [line.strip() for line in f.read().split('\n')
+ if line.strip() != '']
+ finally:
+ f.close()
# Do we have the new file in MANIFEST?
self.assertEqual(len(manifest2), 4)
@@ -364,9 +370,11 @@
cmd.run()
f = open(cmd.manifest)
- manifest = [line.strip() for line in f.read().split('\n')
- if line.strip() != '']
- f.close()
+ try:
+ manifest = [line.strip() for line in f.read().split('\n')
+ if line.strip() != '']
+ finally:
+ f.close()
self.assertEqual(manifest[0],
'# file GENERATED by distutils2, do NOT edit')
@@ -380,9 +388,11 @@
cmd.run()
f = open(cmd.manifest)
- manifest = [line.strip() for line in f.read().split('\n')
- if line.strip() != '']
- f.close()
+ try:
+ manifest = [line.strip() for line in f.read().split('\n')
+ if line.strip() != '']
+ finally:
+ f.close()
self.assertEqual(manifest, ['README.manual'])
@@ -394,8 +404,10 @@
self.write_file((self.tmp_dir, 'yeah'), 'xxx')
cmd.run()
f = open(cmd.manifest)
- content = f.read()
- f.close()
+ try:
+ content = f.read()
+ finally:
+ f.close()
self.assertIn('yeah', content)
diff --git a/distutils2/tests/test_command_upload.py b/distutils2/tests/test_command_upload.py
--- a/distutils2/tests/test_command_upload.py
+++ b/distutils2/tests/test_command_upload.py
@@ -1,3 +1,4 @@
+# encoding: utf-8
"""Tests for distutils2.command.upload."""
import os
@@ -101,22 +102,23 @@
command, pyversion, filename = 'xxx', '3.3', path
dist_files = [(command, pyversion, filename)]
- # lets run it
- pkg_dir, dist = self.create_dist(dist_files=dist_files, author='d\xc3d\xc3')
+ # let's run it
+ dist = self.create_dist(dist_files=dist_files, author='dédé')[1]
cmd = upload(dist)
cmd.ensure_finalized()
cmd.repository = self.pypi.full_address
cmd.run()
- # what did we send ?
+ # what did we send?
handler, request_data = self.pypi.requests[-1]
headers = handler.headers
- #self.assertIn('d\xc3d\xc3', str(request_data))
+ self.assertIn('dédé', request_data)
self.assertIn('xxx', request_data)
self.assertEqual(int(headers['content-length']), len(request_data))
self.assertLess(int(headers['content-length']), 2500)
- self.assertTrue(headers['content-type'].startswith('multipart/form-data'))
+ self.assertTrue(headers['content-type'].startswith(
+ 'multipart/form-data'))
self.assertEqual(handler.command, 'POST')
self.assertNotIn('\n', headers['authorization'])
@@ -130,20 +132,16 @@
self.write_file(os.path.join(docs_path, "index.html"), "yellow")
self.write_file(self.rc, PYPIRC)
- # lets run it
- pkg_dir, dist = self.create_dist(dist_files=dist_files, author='d\xc3d\xc3')
+ # let's run it
+ dist = self.create_dist(dist_files=dist_files, author='dédé')[1]
cmd = upload(dist)
cmd.get_finalized_command("build").run()
cmd.upload_docs = True
cmd.ensure_finalized()
cmd.repository = self.pypi.full_address
- prev_dir = os.getcwd()
- try:
- os.chdir(self.tmp_dir)
- cmd.run()
- finally:
- os.chdir(prev_dir)
+ os.chdir(self.tmp_dir)
+ cmd.run()
handler, request_data = self.pypi.requests[-1]
action, name, content = request_data.split(
@@ -156,6 +154,8 @@
UploadTestCase = unittest.skipIf(threading is None, 'needs threading')(
UploadTestCase)
+
+
def test_suite():
return unittest.makeSuite(UploadTestCase)
diff --git a/distutils2/tests/test_command_upload_docs.py b/distutils2/tests/test_command_upload_docs.py
--- a/distutils2/tests/test_command_upload_docs.py
+++ b/distutils2/tests/test_command_upload_docs.py
@@ -50,34 +50,27 @@
def test_default_uploaddir(self):
sandbox = self.mkdtemp()
- previous = os.getcwd()
os.chdir(sandbox)
- try:
- os.mkdir("build")
- self.prepare_sample_dir("build")
- self.cmd.ensure_finalized()
- self.assertEqual(self.cmd.upload_dir, os.path.join("build", "docs"))
- finally:
- os.chdir(previous)
+ os.mkdir("build")
+ self.prepare_sample_dir("build")
+ self.cmd.ensure_finalized()
+ self.assertEqual(self.cmd.upload_dir, os.path.join("build", "docs"))
def test_default_uploaddir_looks_for_doc_also(self):
sandbox = self.mkdtemp()
- previous = os.getcwd()
os.chdir(sandbox)
- try:
- os.mkdir("build")
- self.prepare_sample_dir("build")
- os.rename(os.path.join("build", "docs"), os.path.join("build", "doc"))
- self.cmd.ensure_finalized()
- self.assertEqual(self.cmd.upload_dir, os.path.join("build", "doc"))
- finally:
- os.chdir(previous)
+ os.mkdir("build")
+ self.prepare_sample_dir("build")
+ os.rename(os.path.join("build", "docs"), os.path.join("build", "doc"))
+ self.cmd.ensure_finalized()
+ self.assertEqual(self.cmd.upload_dir, os.path.join("build", "doc"))
def prepare_sample_dir(self, sample_dir=None):
if sample_dir is None:
sample_dir = self.mkdtemp()
os.mkdir(os.path.join(sample_dir, "docs"))
- self.write_file(os.path.join(sample_dir, "docs", "index.html"), "Ce mortel ennui")
+ self.write_file(os.path.join(sample_dir, "docs", "index.html"),
+ "Ce mortel ennui")
self.write_file(os.path.join(sample_dir, "index.html"), "Oh la la")
return sample_dir
@@ -106,9 +99,8 @@
self.assertTrue(handler.headers['content-type']
.startswith('multipart/form-data;'))
- action, name, version, content =\
- request_data.split("----------------GHSKFJDLGDS7543FJKLFHRE75642756743254".encode())[1:5]
-
+ action, name, version, content = request_data.split(
+ '----------------GHSKFJDLGDS7543FJKLFHRE75642756743254')[1:5]
# check that we picked the right chunks
self.assertIn('name=":action"', action)
@@ -125,8 +117,9 @@
@unittest.skipIf(_ssl is None, 'Needs SSL support')
def test_https_connection(self):
self.https_called = False
-
- orig_https = upload_docs_mod.httplib.HTTPSConnection
+ self.addCleanup(
+ setattr, upload_docs_mod.httplib, 'HTTPSConnection',
+ upload_docs_mod.httplib.HTTPSConnection)
def https_conn_wrapper(*args):
self.https_called = True
@@ -134,16 +127,14 @@
return upload_docs_mod.httplib.HTTPConnection(*args)
upload_docs_mod.httplib.HTTPSConnection = https_conn_wrapper
- try:
- self.prepare_command()
- self.cmd.run()
- self.assertFalse(self.https_called)
- self.cmd.repository = self.cmd.repository.replace("http", "https")
- self.cmd.run()
- self.assertTrue(self.https_called)
- finally:
- upload_docs_mod.httplib.HTTPSConnection = orig_https
+ self.prepare_command()
+ self.cmd.run()
+ self.assertFalse(self.https_called)
+
+ self.cmd.repository = self.cmd.repository.replace("http", "https")
+ self.cmd.run()
+ self.assertTrue(self.https_called)
def test_handling_response(self):
self.pypi.default_response_status = '403 Forbidden'
@@ -152,7 +143,8 @@
self.assertIn('Upload failed (403): Forbidden', self.get_logs()[-1])
self.pypi.default_response_status = '301 Moved Permanently'
- self.pypi.default_response_headers.append(("Location", "brand_new_location"))
+ self.pypi.default_response_headers.append(
+ ("Location", "brand_new_location"))
self.cmd.run()
self.assertIn('brand_new_location', self.get_logs()[-1])
@@ -182,7 +174,10 @@
self.assertTrue(record, "should report the response")
self.assertIn(self.pypi.default_response_data, record)
-UploadDocsTestCase = unittest.skipIf(threading is None, "Needs threading")(UploadDocsTestCase)
+UploadDocsTestCase = unittest.skipIf(threading is None, "Needs threading")(
+ UploadDocsTestCase)
+
+
def test_suite():
return unittest.makeSuite(UploadDocsTestCase)
diff --git a/distutils2/tests/test_compiler.py b/distutils2/tests/test_compiler.py
--- a/distutils2/tests/test_compiler.py
+++ b/distutils2/tests/test_compiler.py
@@ -2,7 +2,7 @@
import os
from distutils2.compiler import (get_default_compiler, customize_compiler,
- gen_lib_options)
+ gen_lib_options)
from distutils2.tests import unittest, support
diff --git a/distutils2/tests/test_config.py b/distutils2/tests/test_config.py
--- a/distutils2/tests/test_config.py
+++ b/distutils2/tests/test_config.py
@@ -1,3 +1,4 @@
+# encoding: utf-8
"""Tests for distutils2.config."""
import os
import sys
@@ -20,7 +21,7 @@
version = 0.6.4
author = Carl Meyer
author_email = carl at oddbird.net
-maintainer = \xc3ric Araujo
+maintainer = Éric Araujo
maintainer_email = merwok at netwok.org
summary = A sample project demonstrating distutils2
description-file = %(description-file)s
@@ -441,9 +442,10 @@
cmd.get_file_list()
cmd.make_distribution()
fp = open('MANIFEST')
- content = fp.read()
- fp.close()
- self.assertIn('README\nREADME2\n', content)
+ try:
+ self.assertIn('README\nREADME2\n', fp.read())
+ finally:
+ fp.close()
def test_sub_commands(self):
self.write_setup()
diff --git a/distutils2/tests/test_create.py b/distutils2/tests/test_create.py
--- a/distutils2/tests/test_create.py
+++ b/distutils2/tests/test_create.py
@@ -1,11 +1,12 @@
+# encoding: utf-8
"""Tests for distutils2.create."""
-from StringIO import StringIO
-import codecs
import os
import sys
+import codecs
+from StringIO import StringIO
from textwrap import dedent
+from distutils2.create import MainProgram, ask_yn, ask, main
from distutils2._backport import sysconfig
-from distutils2.create import MainProgram, ask_yn, ask, main
from distutils2.tests import support, unittest
@@ -40,13 +41,13 @@
super(CreateTestCase, self).tearDown()
def test_ask_yn(self):
- sys.stdin.write(u'y\n')
+ sys.stdin.write('y\n')
sys.stdin.seek(0)
self.assertEqual('y', ask_yn('is this a test'))
def test_ask(self):
- sys.stdin.write(u'a\n')
- sys.stdin.write(u'b\n')
+ sys.stdin.write('a\n')
+ sys.stdin.write('b\n')
sys.stdin.seek(0)
self.assertEqual('a', ask('is this a test'))
self.assertEqual('b', ask(str(list(range(0, 70))), default='c',
@@ -54,7 +55,7 @@
def test_set_multi(self):
mainprogram = MainProgram()
- sys.stdin.write(u'aaaaa\n')
+ sys.stdin.write('aaaaa\n')
sys.stdin.seek(0)
mainprogram.data['author'] = []
mainprogram._set_multi('_set_multi test', 'author')
@@ -109,7 +110,7 @@
version='0.2',
description='Python bindings for the Xfoil engine',
long_description=long_description,
- maintainer='Andr\xc3 Espaze',
+ maintainer='André Espaze',
maintainer_email='andre.espaze at logilab.fr',
url='http://www.python-science.org/project/pyxfoil',
license='GPLv2',
@@ -136,10 +137,12 @@
sys.stdin.seek(0)
main()
- fp = codecs.open(os.path.join(self.wdir, 'setup.cfg'),
- encoding='utf-8')
- contents = fp.read()
- fp.close()
+ path = os.path.join(self.wdir, 'setup.cfg')
+ fp = codecs.open(path, encoding='utf-8')
+ try:
+ contents = fp.read()
+ finally:
+ fp.close()
self.assertEqual(contents, dedent(u"""\
[metadata]
@@ -148,7 +151,7 @@
summary = Python bindings for the Xfoil engine
download_url = UNKNOWN
home_page = http://www.python-science.org/project/pyxfoil
- maintainer = Andr\xc3 Espaze
+ maintainer = André Espaze
maintainer_email = andre.espaze at logilab.fr
description = My super Death-scription
|barbar is now on the public domain,
@@ -185,14 +188,16 @@
# coding: utf-8
from distutils.core import setup
fp = open('README.txt')
- long_description = fp.read()
- fp.close()
+ try:
+ long_description = fp.read()
+ finally:
+ fp.close()
setup(name='pyxfoil',
version='0.2',
description='Python bindings for the Xfoil engine',
long_description=long_description,
- maintainer='Andr\xc3 Espaze',
+ maintainer='André Espaze',
maintainer_email='andre.espaze at logilab.fr',
url='http://www.python-science.org/project/pyxfoil',
license='GPLv2',
@@ -210,13 +215,17 @@
barbar is now in the public domain,
ho, baby!
'''))
- sys.stdin.write(u'y\n')
+ sys.stdin.write('y\n')
sys.stdin.seek(0)
# FIXME Out of memory error.
main()
- fp = codecs.open(os.path.join(self.wdir, 'setup.cfg'), encoding='utf-8')
- contents = fp.read()
- fp.close()
+
+ path = os.path.join(self.wdir, 'setup.cfg')
+ fp = codecs.open(path, encoding='utf-8')
+ try:
+ contents = fp.read()
+ finally:
+ fp.close()
self.assertEqual(contents, dedent(u"""\
[metadata]
@@ -225,7 +234,7 @@
summary = Python bindings for the Xfoil engine
download_url = UNKNOWN
home_page = http://www.python-science.org/project/pyxfoil
- maintainer = Andr\xc3 Espaze
+ maintainer = André Espaze
maintainer_email = andre.espaze at logilab.fr
description-file = README.txt
diff --git a/distutils2/tests/test_database.py b/distutils2/tests/test_database.py
--- a/distutils2/tests/test_database.py
+++ b/distutils2/tests/test_database.py
@@ -33,8 +33,10 @@
def get_hexdigest(filename):
fp = open(filename, 'rb')
- checksum = md5(fp.read())
- fp.close()
+ try:
+ checksum = md5(fp.read())
+ finally:
+ fp.close()
return checksum.hexdigest()
@@ -64,12 +66,13 @@
# back (to avoid getting a read-only copy of a read-only file). we
# could pass a custom copy_function to change the mode of files, but
# shutil gives no control over the mode of directories :(
+ # see http://bugs.python.org/issue1666318
for root, dirs, files in os.walk(self.fake_dists_path):
- os.chmod(root, 00755)
+ os.chmod(root, 0755)
for f in files:
- os.chmod(os.path.join(root, f), 00644)
+ os.chmod(os.path.join(root, f), 0644)
for d in dirs:
- os.chmod(os.path.join(root, d), 00755)
+ os.chmod(os.path.join(root, d), 0755)
class CommonDistributionTests(FakeDistsMixin):
@@ -139,32 +142,36 @@
record_file = os.path.join(distinfo_dir, 'RECORD')
fp = open(record_file, 'w')
- record_writer = csv.writer(
- fp, delimiter=',', quoting=csv.QUOTE_NONE,
- lineterminator='\n')
+ try:
+ record_writer = csv.writer(
+ fp, delimiter=',', quoting=csv.QUOTE_NONE,
+ lineterminator='\n')
- dist_location = distinfo_dir.replace('.dist-info', '')
+ dist_location = distinfo_dir.replace('.dist-info', '')
- for path, dirs, files in os.walk(dist_location):
- for f in files:
+ for path, dirs, files in os.walk(dist_location):
+ for f in files:
+ record_writer.writerow(record_pieces(
+ os.path.join(path, f)))
+ for file in ('INSTALLER', 'METADATA', 'REQUESTED'):
record_writer.writerow(record_pieces(
- os.path.join(path, f)))
- for file in ('INSTALLER', 'METADATA', 'REQUESTED'):
- record_writer.writerow(record_pieces(
- os.path.join(distinfo_dir, file)))
- record_writer.writerow([relpath(record_file, sys.prefix)])
- fp.close()
+ os.path.join(distinfo_dir, file)))
+ record_writer.writerow([relpath(record_file, sys.prefix)])
+ finally:
+ fp.close()
fp = open(record_file)
- record_reader = csv.reader(fp, lineterminator='\n')
- record_data = {}
- for row in record_reader:
- if row == []:
- continue
- path, md5_, size = (row[:] +
- [None for i in range(len(row), 3)])
- record_data[path] = md5_, size
- fp.close()
+ try:
+ record_reader = csv.reader(fp, lineterminator='\n')
+ record_data = {}
+ for row in record_reader:
+ if row == []:
+ continue
+ path, md5_, size = (row[:] +
+ [None for i in range(len(row), 3)])
+ record_data[path] = md5_, size
+ finally:
+ fp.close()
self.records[distinfo_dir] = record_data
def test_instantiation(self):
@@ -207,11 +214,13 @@
for distfile in distinfo_files:
value = dist.get_distinfo_file(distfile)
- self.assertIsInstance(value, file)
- # Is it the correct file?
- self.assertEqual(value.name,
- os.path.join(distinfo_dir, distfile))
- value.close()
+ try:
+ self.assertIsInstance(value, file)
+ # Is it the correct file?
+ self.assertEqual(value.name,
+ os.path.join(distinfo_dir, distfile))
+ finally:
+ value.close()
# Test an absolute path that is part of another distributions dist-info
other_distinfo_file = os.path.join(
@@ -632,14 +641,16 @@
resources_path = os.path.join(dist_info, 'RESOURCES')
fp = open(metadata_path, 'w')
- fp.write(dedent("""\
- Metadata-Version: 1.2
- Name: test
- Version: 0.1
- Summary: test
- Author: me
- """))
- fp.close()
+ try:
+ fp.write(dedent("""\
+ Metadata-Version: 1.2
+ Name: test
+ Version: 0.1
+ Summary: test
+ Author: me
+ """))
+ finally:
+ fp.close()
test_path = 'test.cfg'
fd, test_resource_path = tempfile.mkstemp()
@@ -647,12 +658,16 @@
self.addCleanup(os.remove, test_resource_path)
fp = open(test_resource_path, 'w')
- fp.write('Config')
- fp.close()
+ try:
+ fp.write('Config')
+ finally:
+ fp.close()
fp = open(resources_path, 'w')
- fp.write('%s,%s' % (test_path, test_resource_path))
- fp.close()
+ try:
+ fp.write('%s,%s' % (test_path, test_resource_path))
+ finally:
+ fp.close()
# Add fake site-packages to sys.path to retrieve fake dist
self.addCleanup(sys.path.remove, temp_site_packages)
@@ -668,8 +683,10 @@
self.assertRaises(KeyError, get_file_path, dist_name, 'i-dont-exist')
fp = get_file(dist_name, test_path)
- self.assertEqual(fp.read(), 'Config')
- fp.close()
+ try:
+ self.assertEqual(fp.read(), 'Config')
+ finally:
+ fp.close()
self.assertRaises(KeyError, get_file, dist_name, 'i-dont-exist')
diff --git a/distutils2/tests/test_depgraph.py b/distutils2/tests/test_depgraph.py
--- a/distutils2/tests/test_depgraph.py
+++ b/distutils2/tests/test_depgraph.py
@@ -4,8 +4,8 @@
import sys
from StringIO import StringIO
-import distutils2.database
from distutils2 import depgraph
+from distutils2.database import get_distribution, enable_cache, disable_cache
from distutils2.tests import unittest, support
from distutils2.tests.support import requires_zlib
@@ -31,13 +31,13 @@
path = os.path.abspath(path)
sys.path.insert(0, path)
self.addCleanup(sys.path.remove, path)
- self.addCleanup(distutils2.database.enable_cache)
- distutils2.database.disable_cache()
+ self.addCleanup(enable_cache)
+ disable_cache()
def test_generate_graph(self):
dists = []
for name in self.DISTROS_DIST:
- dist = distutils2.database.get_distribution(name)
+ dist = get_distribution(name)
self.assertNotEqual(dist, None)
dists.append(dist)
@@ -62,7 +62,7 @@
def test_generate_graph_egg(self):
dists = []
for name in self.DISTROS_DIST + self.DISTROS_EGG:
- dist = distutils2.database.get_distribution(name, use_egg_info=True)
+ dist = get_distribution(name, use_egg_info=True)
self.assertNotEqual(dist, None)
dists.append(dist)
@@ -105,7 +105,7 @@
def test_dependent_dists(self):
dists = []
for name in self.DISTROS_DIST:
- dist = distutils2.database.get_distribution(name)
+ dist = get_distribution(name)
self.assertNotEqual(dist, None)
dists.append(dist)
@@ -124,7 +124,7 @@
def test_dependent_dists_egg(self):
dists = []
for name in self.DISTROS_DIST + self.DISTROS_EGG:
- dist = distutils2.database.get_distribution(name, use_egg_info=True)
+ dist = get_distribution(name, use_egg_info=True)
self.assertNotEqual(dist, None)
dists.append(dist)
@@ -159,7 +159,7 @@
dists = []
for name in self.DISTROS_DIST + self.DISTROS_EGG:
- dist = distutils2.database.get_distribution(name, use_egg_info=True)
+ dist = get_distribution(name, use_egg_info=True)
self.assertNotEqual(dist, None)
dists.append(dist)
@@ -190,7 +190,7 @@
dists = []
for name in self.DISTROS_DIST + self.DISTROS_EGG:
- dist = distutils2.database.get_distribution(name, use_egg_info=True)
+ dist = get_distribution(name, use_egg_info=True)
self.assertNotEqual(dist, None)
dists.append(dist)
@@ -251,7 +251,7 @@
dists = []
for name in self.DISTROS_DIST + self.DISTROS_EGG + self.BAD_EGGS:
- dist = distutils2.database.get_distribution(name, use_egg_info=True)
+ dist = get_distribution(name, use_egg_info=True)
self.assertNotEqual(dist, None)
dists.append(dist)
@@ -274,7 +274,7 @@
def test_repr(self):
dists = []
for name in self.DISTROS_DIST + self.DISTROS_EGG + self.BAD_EGGS:
- dist = distutils2.database.get_distribution(name, use_egg_info=True)
+ dist = get_distribution(name, use_egg_info=True)
self.assertNotEqual(dist, None)
dists.append(dist)
diff --git a/distutils2/tests/test_dist.py b/distutils2/tests/test_dist.py
--- a/distutils2/tests/test_dist.py
+++ b/distutils2/tests/test_dist.py
@@ -1,7 +1,7 @@
"""Tests for distutils2.dist."""
-import codecs
import os
import sys
+import codecs
import logging
import textwrap
from distutils2._backport import sysconfig
@@ -16,7 +16,7 @@
from distutils2.tests import captured_stdout
from distutils2.tests import support, unittest
from distutils2.tests.support import create_distribution
-from distutils2.tests.support import unload, TESTFN
+from distutils2.tests.support import unload
class test_dist(Command):
@@ -50,17 +50,23 @@
sys.argv[:] = self.argv[1]
super(DistributionTestCase, self).tearDown()
+ @unittest.skip('needs to be updated')
def test_debug_mode(self):
- self.addCleanup(os.unlink, TESTFN)
- f = open(TESTFN, "w")
- f.write("[global]\n")
- f.write("command_packages = foo.bar, splat")
- f.close()
+ tmpdir = self.mkdtemp()
+ setupcfg = os.path.join(tmpdir, 'setup.cfg')
+ f = open(setupcfg, "w")
+ try:
+ f.write("[global]\n")
+ f.write("command_packages = foo.bar, splat")
+ finally:
+ f.close()
- files = [TESTFN]
+ files = [setupcfg]
sys.argv.append("build")
__, stdout = captured_stdout(create_distribution, files)
self.assertEqual(stdout, '')
+ # XXX debug mode does not exist anymore, test logging levels in this
+ # test instead
distutils2.dist.DEBUG = True
try:
__, stdout = captured_stdout(create_distribution, files)
@@ -145,7 +151,6 @@
self.assertIn('owner', dist.get_option_dict('sdist'))
def test_finalize_options(self):
-
attrs = {'keywords': 'one,two',
'platform': 'one,two'}
@@ -165,8 +170,10 @@
user_filename = os.path.join(temp_home, "pydistutils.cfg")
f = open(user_filename, 'w')
- f.write('[distutils2]\n')
- f.close()
+ try:
+ f.write('[distutils2]\n')
+ finally:
+ f.close()
def _expander(path):
return temp_home
@@ -180,10 +187,8 @@
d = distutils2.dist.Distribution(attrs={'script_args':
['--no-user-cfg']})
files = d.find_config_files()
- except:
+ finally:
os.path.expanduser = old_expander
- raise
- os.path.expanduser = old_expander
# make sure --no-user-cfg disables the user cfg file
self.assertEqual((len(all_files) - 1), len(files))
diff --git a/distutils2/tests/test_install.py b/distutils2/tests/test_install.py
--- a/distutils2/tests/test_install.py
+++ b/distutils2/tests/test_install.py
@@ -7,7 +7,7 @@
from distutils2.pypi.xmlrpc import Client
from distutils2.metadata import Metadata
from distutils2.tests.support import (LoggingCatcher, TempdirManager, unittest,
- fake_dec)
+ fake_dec)
from distutils2._backport.sysconfig import is_python_build
try:
diff --git a/distutils2/tests/test_manifest.py b/distutils2/tests/test_manifest.py
--- a/distutils2/tests/test_manifest.py
+++ b/distutils2/tests/test_manifest.py
@@ -38,8 +38,10 @@
tmpdir = self.mkdtemp()
MANIFEST = os.path.join(tmpdir, 'MANIFEST.in')
f = open(MANIFEST, 'w')
- f.write(_MANIFEST)
- f.close()
+ try:
+ f.write(_MANIFEST)
+ finally:
+ f.close()
manifest = Manifest()
manifest.read_template(MANIFEST)
@@ -53,8 +55,10 @@
# manifest also accepts file-like objects
f = open(MANIFEST)
- manifest.read_template(f)
- f.close()
+ try:
+ manifest.read_template(f)
+ finally:
+ f.close()
# the manifest should have been read and 3 warnings issued
# (we didn't provide the files)
diff --git a/distutils2/tests/test_markers.py b/distutils2/tests/test_markers.py
--- a/distutils2/tests/test_markers.py
+++ b/distutils2/tests/test_markers.py
@@ -19,7 +19,7 @@
platform_machine = platform.machine()
try:
platform_python_implementation = platform.python_implementation()
- except AttributeError: #assume CPython
+ except AttributeError: # FIXME import from compat
platform_python_implementation = 'CPython'
self.assertTrue(interpret("sys.platform == '%s'" % sys_platform))
diff --git a/distutils2/tests/test_metadata.py b/distutils2/tests/test_metadata.py
--- a/distutils2/tests/test_metadata.py
+++ b/distutils2/tests/test_metadata.py
@@ -1,7 +1,7 @@
"""Tests for distutils2.metadata."""
-import codecs
import os
import sys
+import codecs
import logging
from StringIO import StringIO
@@ -19,8 +19,10 @@
def test_instantiation(self):
PKG_INFO = os.path.join(os.path.dirname(__file__), 'PKG-INFO')
f = codecs.open(PKG_INFO, 'r', encoding='utf-8')
- contents = f.read()
- f.close()
+ try:
+ contents = f.read()
+ finally:
+ f.close()
fp = StringIO(contents)
@@ -61,8 +63,10 @@
# see if we can be platform-aware
PKG_INFO = os.path.join(os.path.dirname(__file__), 'PKG-INFO')
f = codecs.open(PKG_INFO, 'r', encoding='utf-8')
- content = f.read() % sys.platform
- f.close()
+ try:
+ content = f.read() % sys.platform
+ finally:
+ f.close()
metadata = Metadata(platform_dependent=True)
metadata.read_file(StringIO(content))
@@ -74,24 +78,27 @@
# test with context
context = {'sys.platform': 'okook'}
- metadata = Metadata(platform_dependent=True,
- execution_context=context)
+ metadata = Metadata(platform_dependent=True, execution_context=context)
metadata.read_file(StringIO(content))
self.assertEqual(metadata['Requires-Dist'], ['foo'])
def test_description(self):
PKG_INFO = os.path.join(os.path.dirname(__file__), 'PKG-INFO')
f = codecs.open(PKG_INFO, 'r', encoding='utf-8')
- content = f.read() % sys.platform
- f.close()
+ try:
+ content = f.read() % sys.platform
+ finally:
+ f.close()
metadata = Metadata()
metadata.read_file(StringIO(content))
# see if we can read the description now
DESC = os.path.join(os.path.dirname(__file__), 'LONG_DESC.txt')
f = open(DESC)
- wanted = f.read()
- f.close()
+ try:
+ wanted = f.read()
+ finally:
+ f.close()
self.assertEqual(wanted, metadata['Description'])
# save the file somewhere and make sure we can read it back
@@ -104,8 +111,10 @@
def test_mapping_api(self):
PKG_INFO = os.path.join(os.path.dirname(__file__), 'PKG-INFO')
f = codecs.open(PKG_INFO, 'r', encoding='utf-8')
- content = f.read() % sys.platform
- f.close()
+ try:
+ content = f.read() % sys.platform
+ finally:
+ f.close()
metadata = Metadata(fileobj=StringIO(content))
self.assertIn('Version', metadata.keys())
self.assertIn('0.5', metadata.values())
@@ -138,16 +147,20 @@
PKG_INFO = os.path.join(os.path.dirname(__file__),
'SETUPTOOLS-PKG-INFO')
f = codecs.open(PKG_INFO, 'r', encoding='utf-8')
- content = f.read()
- f.close()
+ try:
+ content = f.read()
+ finally:
+ f.close()
metadata.read_file(StringIO(content))
self.assertEqual(metadata['Metadata-Version'], '1.0')
PKG_INFO = os.path.join(os.path.dirname(__file__),
'SETUPTOOLS-PKG-INFO2')
f = codecs.open(PKG_INFO, 'r', encoding='utf-8')
- content = f.read()
- f.close()
+ try:
+ content = f.read()
+ finally:
+ f.close()
metadata.read_file(StringIO(content))
self.assertEqual(metadata['Metadata-Version'], '1.1')
diff --git a/distutils2/tests/test_mixin2to3.py b/distutils2/tests/test_mixin2to3.py
--- a/distutils2/tests/test_mixin2to3.py
+++ b/distutils2/tests/test_mixin2to3.py
@@ -15,16 +15,20 @@
code = "print 'test'"
fp = self.mktempfile()
- fp.write(code)
- fp.close()
+ try:
+ fp.write(code)
+ finally:
+ fp.close()
mixin2to3 = Mixin2to3()
mixin2to3._run_2to3([fp.name])
expected = "print('test')"
fp = open(fp.name)
- converted = fp.read()
- fp.close()
+ try:
+ converted = fp.read()
+ finally:
+ fp.close()
self.assertEqual(expected, converted)
@@ -41,8 +45,10 @@
"""''')
fp = self.mktempfile()
- fp.write(doctest)
- fp.close()
+ try:
+ fp.write(doctest)
+ finally:
+ fp.close()
mixin2to3 = Mixin2to3()
mixin2to3._run_2to3([fp.name])
@@ -56,8 +62,10 @@
"""\n''')
fp = open(fp.name)
- converted = fp.read()
- fp.close()
+ try:
+ converted = fp.read()
+ finally:
+ fp.close()
self.assertEqual(expected, converted)
@@ -67,8 +75,10 @@
code = 'type(x) is not T'
fp = self.mktempfile()
- fp.write(code)
- fp.close()
+ try:
+ fp.write(code)
+ finally:
+ fp.close()
mixin2to3 = Mixin2to3()
mixin2to3._run_2to3(files=[fp.name], doctests=[fp.name],
@@ -77,8 +87,10 @@
expected = 'not isinstance(x, T)'
fp = open(fp.name)
- converted = fp.read()
- fp.close()
+ try:
+ converted = fp.read()
+ finally:
+ fp.close()
self.assertEqual(expected, converted)
diff --git a/distutils2/tests/test_msvc9compiler.py b/distutils2/tests/test_msvc9compiler.py
--- a/distutils2/tests/test_msvc9compiler.py
+++ b/distutils2/tests/test_msvc9compiler.py
@@ -119,17 +119,21 @@
tempdir = self.mkdtemp()
manifest = os.path.join(tempdir, 'manifest')
f = open(manifest, 'w')
- f.write(_MANIFEST)
- f.close()
+ try:
+ f.write(_MANIFEST)
+ finally:
+ f.close()
compiler = MSVCCompiler()
compiler._remove_visual_c_ref(manifest)
# see what we got
f = open(manifest)
- # removing trailing spaces
- content = '\n'.join(line.rstrip() for line in f.readlines())
- f.close()
+ try:
+ # removing trailing spaces
+ content = '\n'.join(line.rstrip() for line in f.readlines())
+ finally:
+ f.close()
# makes sure the manifest was properly cleaned
self.assertEqual(content, _CLEANED_MANIFEST)
diff --git a/distutils2/tests/test_pypi_server.py b/distutils2/tests/test_pypi_server.py
--- a/distutils2/tests/test_pypi_server.py
+++ b/distutils2/tests/test_pypi_server.py
@@ -1,11 +1,10 @@
"""Tests for distutils2.command.bdist."""
-import sys
-
import urllib2
try:
import threading
- from distutils2.tests.pypi_server import PyPIServer, PYPI_DEFAULT_STATIC_PATH
+ from distutils2.tests.pypi_server import (
+ PyPIServer, PYPI_DEFAULT_STATIC_PATH)
except ImportError:
threading = None
PyPIServer = None
@@ -13,6 +12,7 @@
from distutils2.tests import unittest
+
class PyPIServerTest(unittest.TestCase):
def test_records_requests(self):
@@ -34,12 +34,11 @@
handler, request_data = server.requests[-1]
self.assertIn(data, request_data)
self.assertIn("x-test-header", handler.headers)
- self.assertEqual(handler.headers["x-test-header"], "Mister Iceberg")
+ self.assertEqual(handler.headers["x-test-header"],
+ "Mister Iceberg")
- except:
+ finally:
server.stop()
- raise
- server.stop()
def test_serve_static_content(self):
# PYPI Mocked server can serve static content from disk.
@@ -51,11 +50,12 @@
url = server.full_address + url_path
request = urllib2.Request(url)
response = urllib2.urlopen(request)
- fp = open(PYPI_DEFAULT_STATIC_PATH + "/test_pypi_server"
- + url_path)
- content = fp.read()
- fp.close()
- return response.read().decode() == content
+ file = open(PYPI_DEFAULT_STATIC_PATH + "/test_pypi_server"
+ + url_path)
+ try:
+ return response.read().decode() == file.read()
+ finally:
+ file.close()
server = PyPIServer(static_uri_paths=["simple", "external"],
static_filesystem_paths=["test_pypi_server"])
@@ -66,23 +66,24 @@
request = urllib2.Request(url)
try:
urllib2.urlopen(request)
- except urllib2.HTTPError:
- self.assertEqual(sys.exc_info()[1].code, 404)
+ except urllib2.HTTPError, e:
+ self.assertEqual(e.code, 404)
# now try serving a content that do exists
self.assertTrue(uses_local_files_for(server, "/simple/index.html"))
# and another one in another root path
- self.assertTrue(uses_local_files_for(server, "/external/index.html"))
+ self.assertTrue(uses_local_files_for(server,
+ "/external/index.html"))
- except:
+ finally:
server.stop()
- raise
- server.stop()
+
PyPIServerTest = unittest.skipIf(threading is None, "Needs threading")(
PyPIServerTest)
+
def test_suite():
return unittest.makeSuite(PyPIServerTest)
diff --git a/distutils2/tests/test_pypi_simple.py b/distutils2/tests/test_pypi_simple.py
--- a/distutils2/tests/test_pypi_simple.py
+++ b/distutils2/tests/test_pypi_simple.py
@@ -9,7 +9,7 @@
from distutils2.tests import unittest
from distutils2.tests.support import (TempdirManager, LoggingCatcher,
- fake_dec)
+ fake_dec)
try:
import thread as _thread
@@ -43,8 +43,8 @@
url = 'http://127.0.0.1:0/nonesuch/test_simple'
try:
v = crawler._open_url(url)
- except Exception:
- self.assertIn(url, str(sys.exc_info()[1]))
+ except Exception, v:
+ self.assertIn(url, str(v))
else:
v.close()
self.assertIsInstance(v, urllib2.HTTPError)
@@ -57,8 +57,8 @@
'inquant.contentmirror.plone/trunk')
try:
v = crawler._open_url(url)
- except Exception:
- self.assertIn(url, str(sys.exc_info()[1]))
+ except Exception, v:
+ self.assertIn(url, str(v))
else:
v.close()
self.assertIsInstance(v, urllib2.HTTPError)
@@ -70,22 +70,23 @@
urllib2.urlopen = _urlopen
url = 'http://example.org'
try:
- v = crawler._open_url(url)
- except:
+ try:
+ v = crawler._open_url(url)
+ except Exception, v:
+ self.assertIn('line', str(v))
+ else:
+ v.close()
+ # TODO use self.assertRaises
+ raise AssertionError('Should have raise here!')
+ finally:
urllib2.urlopen = old_urlopen
- self.assertIn('line', str(sys.exc_info()[1]))
- else:
- v.close()
- # TODO use self.assertRaises
- raise AssertionError('Should have raise here!')
- urllib2.urlopen = old_urlopen
# issue 20
url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk'
try:
crawler._open_url(url)
- except Exception:
- self.assertIn('nonnumeric port', str(sys.exc_info()[1]))
+ except Exception, v:
+ self.assertIn('nonnumeric port', str(v))
# issue #160
url = server.full_address
@@ -246,12 +247,9 @@
# this should not raise a timeout
self.assertEqual(4, len(crawler.get_releases("foo")))
- except:
+ finally:
mirror.stop()
server.stop()
- raise
- mirror.stop()
- server.stop()
def test_simple_link_matcher(self):
# Test that the simple link matcher finds the right links"""
diff --git a/distutils2/tests/test_pypi_xmlrpc.py b/distutils2/tests/test_pypi_xmlrpc.py
--- a/distutils2/tests/test_pypi_xmlrpc.py
+++ b/distutils2/tests/test_pypi_xmlrpc.py
@@ -90,10 +90,11 @@
self.assertEqual(['Foo'], release.metadata['requires_external'])
self.assertEqual(['FooFoo'], release.metadata['obsoletes_dist'])
-#Compatibility Python pre-2.6
+
TestXMLRPCClient = unittest.skipIf(threading is None, "Needs threading")(
TestXMLRPCClient)
+
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestXMLRPCClient))
diff --git a/distutils2/tests/test_run.py b/distutils2/tests/test_run.py
--- a/distutils2/tests/test_run.py
+++ b/distutils2/tests/test_run.py
@@ -7,12 +7,10 @@
from distutils2 import install
from distutils2.tests import unittest, support
-from distutils2.tests.support import TESTFN
from distutils2.run import main
# setup script that uses __file__
setup_using___file__ = """\
-
__file__
from distutils2.run import setup
@@ -20,7 +18,6 @@
"""
setup_prints_cwd = """\
-
import os
print os.getcwd()
@@ -29,34 +26,20 @@
"""
-class CoreTestCase(support.TempdirManager, support.LoggingCatcher,
- unittest.TestCase):
+class RunTestCase(support.TempdirManager,
+ support.LoggingCatcher,
+ unittest.TestCase):
def setUp(self):
- super(CoreTestCase, self).setUp()
+ super(RunTestCase, self).setUp()
self.old_stdout = sys.stdout
- self.cleanup_testfn()
self.old_argv = sys.argv, sys.argv[:]
def tearDown(self):
sys.stdout = self.old_stdout
- self.cleanup_testfn()
sys.argv = self.old_argv[0]
sys.argv[:] = self.old_argv[1]
- super(CoreTestCase, self).tearDown()
-
- def cleanup_testfn(self):
- path = TESTFN
- if os.path.isfile(path):
- os.remove(path)
- elif os.path.isdir(path):
- shutil.rmtree(path)
-
- def write_setup(self, text, path=TESTFN):
- fp = open(path, "w")
- fp.write(text)
- fp.close()
- return path
+ super(RunTestCase, self).tearDown()
# TODO restore the tests removed six months ago and port them to pysetup
@@ -80,7 +63,7 @@
def test_suite():
- return unittest.makeSuite(CoreTestCase)
+ return unittest.makeSuite(RunTestCase)
if __name__ == "__main__":
unittest.main(defaultTest="test_suite")
diff --git a/distutils2/tests/test_util.py b/distutils2/tests/test_util.py
--- a/distutils2/tests/test_util.py
+++ b/distutils2/tests/test_util.py
@@ -15,10 +15,10 @@
from distutils2 import util
from distutils2.dist import Distribution
from distutils2.util import (
- convert_path, change_root, split_quoted, strtobool, rfc822_escape,
+ convert_path, change_root, split_quoted, strtobool, rfc822_escape, run_2to3,
get_compiler_versions, _MAC_OS_X_LD_VERSION, byte_compile, find_packages,
spawn, get_pypirc_path, generate_pypirc, read_pypirc, resolve_name, iglob,
- RICH_GLOB, egginfo_to_distinfo, is_setuptools, is_distutils, is_distutils2,
+ RICH_GLOB, egginfo_to_distinfo, is_setuptools, is_distutils, is_packaging,
get_install_method, cfg_to_args, encode_multipart)
@@ -381,7 +381,7 @@
res = find_packages([root], ['pkg1.pkg2'])
self.assertEqual(set(res), set(['pkg1', 'pkg5', 'pkg1.pkg3',
- 'pkg1.pkg3.pkg6']))
+ 'pkg1.pkg3.pkg6']))
def test_resolve_name(self):
self.assertIs(str, resolve_name('__builtin__.str'))
@@ -423,7 +423,6 @@
file_handle.write(content)
file_handle.flush()
file_handle.seek(0)
- from distutils2.util import run_2to3
run_2to3([file_name])
new_content = "".join(file_handle.read())
file_handle.close()
@@ -439,7 +438,6 @@
file_handle.write(content)
file_handle.flush()
file_handle.seek(0)
- from distutils2.util import run_2to3
run_2to3([file_name], doctests_only=True)
new_content = "".join(file_handle.readlines())
file_handle.close()
@@ -457,24 +455,24 @@
if os.name == 'posix':
exe = os.path.join(tmpdir, 'foo.sh')
self.write_file(exe, '#!/bin/sh\nexit 1')
- os.chmod(exe, 00777)
+ os.chmod(exe, 0777)
else:
exe = os.path.join(tmpdir, 'foo.bat')
self.write_file(exe, 'exit 1')
- os.chmod(exe, 00777)
+ os.chmod(exe, 0777)
self.assertRaises(PackagingExecError, spawn, [exe])
# now something that works
if os.name == 'posix':
exe = os.path.join(tmpdir, 'foo.sh')
self.write_file(exe, '#!/bin/sh\nexit 0')
- os.chmod(exe, 00777)
+ os.chmod(exe, 0777)
else:
exe = os.path.join(tmpdir, 'foo.bat')
self.write_file(exe, 'exit 0')
- os.chmod(exe, 00777)
+ os.chmod(exe, 0777)
spawn([exe]) # should work without any error
def test_server_registration(self):
@@ -507,8 +505,10 @@
generate_pypirc('tarek', 'xxx')
self.assertTrue(os.path.exists(rc))
f = open(rc)
- content = f.read()
- f.close()
+ try:
+ content = f.read()
+ finally:
+ f.close()
self.assertEqual(content, WANTED)
def test_cfg_to_args(self):
@@ -795,16 +795,20 @@
for f in files:
path = os.path.join(tempdir, f)
_f = open(path, 'w')
- _f.write(f)
- _f.close()
+ try:
+ _f.write(f)
+ finally:
+ _f.close()
file_paths.append(path)
record_file = open(record_file_path, 'w')
- for fpath in file_paths:
- record_file.write(fpath + '\n')
- for dpath in dir_paths:
- record_file.write(dpath + '\n')
- record_file.close()
+ try:
+ for fpath in file_paths:
+ record_file.write(fpath + '\n')
+ for dpath in dir_paths:
+ record_file.write(dpath + '\n')
+ finally:
+ record_file.close()
return (tempdir, record_file_path)
@@ -819,7 +823,7 @@
def test_empty_package_is_not_based_on_anything(self):
self.assertFalse(is_setuptools(self._empty_dir))
self.assertFalse(is_distutils(self._empty_dir))
- self.assertFalse(is_distutils2(self._empty_dir))
+ self.assertFalse(is_packaging(self._empty_dir))
def test_setup_py_importing_setuptools_is_setuptools_based(self):
self.assertTrue(is_setuptools(self._setuptools_setup_py_pkg()))
@@ -846,13 +850,13 @@
self.assertFalse(is_distutils(self._random_setup_py_pkg()))
def test_setup_cfg_with_no_metadata_section_is_not_distutils2_based(self):
- self.assertFalse(is_distutils2(self._setup_cfg_with_no_metadata_pkg()))
+ self.assertFalse(is_packaging(self._setup_cfg_with_no_metadata_pkg()))
- def test_setup_cfg_with_valid_metadata_section_is_distutils2_based(self):
- self.assertTrue(is_distutils2(self._valid_setup_cfg_pkg()))
+ def test_setup_cfg_with_valid_metadata_section_is_packaging_based(self):
+ self.assertTrue(is_packaging(self._valid_setup_cfg_pkg()))
def test_setup_cfg_and_invalid_setup_cfg_is_not_distutils2_based(self):
- self.assertFalse(is_distutils2(self._invalid_setup_cfg_pkg()))
+ self.assertFalse(is_packaging(self._invalid_setup_cfg_pkg()))
def test_get_install_method_with_setuptools_pkg(self):
path = self._setuptools_setup_py_pkg()
@@ -908,13 +912,13 @@
expected = ['setup.py file found.', 'PKG-INFO file found.']
self.assertEqual(expected, self.get_logs(logging.DEBUG))
- def test_is_distutils2_logs_setup_cfg_found(self):
- is_distutils2(self._valid_setup_cfg_pkg())
+ def test_is_packaging_logs_setup_cfg_found(self):
+ is_packaging(self._valid_setup_cfg_pkg())
expected = ['setup.cfg file found.']
self.assertEqual(expected, self.get_logs(logging.DEBUG))
- def test_is_distutils2_logs_setup_cfg_not_found(self):
- is_distutils2(self._empty_dir)
+ def test_is_packaging_logs_setup_cfg_not_found(self):
+ is_packaging(self._empty_dir)
expected = ['No setup.cfg file found.']
self.assertEqual(expected, self.get_logs(logging.DEBUG))
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list