aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-04-01 09:25:00 -0400
committerJason R. Coombs <jaraco@jaraco.com>2012-04-01 09:25:00 -0400
commit61942ccf83167298cbd933f1594d59a32f5cf349 (patch)
tree7b2e973d752523126c829ddd42447387b4af2789
parent5ac3e0119a483c7d9bb43148d2b6f16c546913ff (diff)
downloadexternal_python_setuptools-61942ccf83167298cbd933f1594d59a32f5cf349.tar.gz
external_python_setuptools-61942ccf83167298cbd933f1594d59a32f5cf349.tar.bz2
external_python_setuptools-61942ccf83167298cbd933f1594d59a32f5cf349.zip
Cleaned up excess whitespace
--HG-- branch : distribute extra : rebase_source : 722c3a4c556ba4415c633e74e34fb45f76d8653d
-rw-r--r--setuptools/tests/__init__.py37
1 files changed, 3 insertions, 34 deletions
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index fec3854d..7a3d6eb5 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -40,15 +40,13 @@ def makeSetup(**args):
distutils.core_setup_stop_after = None
-
-
class DependsTests(unittest.TestCase):
def testExtractConst(self):
if not extract_constant: return # skip on non-bytecode platforms
def f1():
- global x,y,z
+ global x, y, z
x = "test"
y = z
@@ -64,11 +62,11 @@ class DependsTests(unittest.TestCase):
# recognized name, not assigned
self.assertEqual(extract_constant(f1.func_code,'z', -1), None)
-
def testFindModule(self):
self.assertRaises(ImportError, find_module, 'no-such.-thing')
self.assertRaises(ImportError, find_module, 'setuptools.non-existent')
- f,p,i = find_module('setuptools.tests'); f.close()
+ f,p,i = find_module('setuptools.tests')
+ f.close()
def testModuleExtract(self):
if not get_module_constant: return # skip on non-bytecode platforms
@@ -137,11 +135,9 @@ class DistroTests(unittest.TestCase):
package_dir = {},
)
-
def testDistroType(self):
self.assert_(isinstance(self.dist,setuptools.dist.Distribution))
-
def testExcludePackage(self):
self.dist.exclude_package('a')
self.assertEqual(self.dist.packages, ['b','c'])
@@ -159,12 +155,6 @@ class DistroTests(unittest.TestCase):
# test removals from unspecified options
makeSetup().exclude_package('x')
-
-
-
-
-
-
def testIncludeExclude(self):
# remove an extension
self.dist.exclude(ext_modules=[self.e1])
@@ -203,9 +193,6 @@ class DistroTests(unittest.TestCase):
self.dist.exclude_package('c')
self.assert_(not self.dist.has_contents_for('c'))
-
-
-
def testInvalidIncludeExclude(self):
self.assertRaises(DistutilsSetupError,
self.dist.include, nonexistent_option='x'
@@ -234,19 +221,6 @@ class DistroTests(unittest.TestCase):
)
-
-
-
-
-
-
-
-
-
-
-
-
-
class FeatureTests(unittest.TestCase):
def setUp(self):
@@ -365,8 +339,3 @@ class TestCommandTests(unittest.TestCase):
ts5 = makeSetup().get_command_obj('test')
ts5.ensure_finalized()
self.assertEqual(ts5.test_suite, None)
-
-
-
-
-