diff options
| -rwxr-xr-x | Lib/plat-mac/bundlebuilder.py | 2 | ||||
| -rw-r--r-- | Lib/plat-mac/pimp.py | 8 | ||||
| -rw-r--r-- | Lib/test/inspect_fodder2.py | 16 | ||||
| -rw-r--r-- | Lib/test/test_csv.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_inspect.py | 43 | ||||
| -rw-r--r-- | Lib/test/test_zlib.py | 2 | ||||
| -rw-r--r-- | Mac/OSX/fixapplepython23.py | 13 | ||||
| -rw-r--r-- | Tools/i18n/makelocalealias.py | 3 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 2 |
9 files changed, 44 insertions, 47 deletions
diff --git a/Lib/plat-mac/bundlebuilder.py b/Lib/plat-mac/bundlebuilder.py index e379544..03d8c81 100755 --- a/Lib/plat-mac/bundlebuilder.py +++ b/Lib/plat-mac/bundlebuilder.py @@ -110,7 +110,7 @@ class BundleBuilder(Defaults): # Verbosity level. verbosity = 1 - + # Destination root directory destroot = "" diff --git a/Lib/plat-mac/pimp.py b/Lib/plat-mac/pimp.py index 255b57c..21923ec 100644 --- a/Lib/plat-mac/pimp.py +++ b/Lib/plat-mac/pimp.py @@ -907,10 +907,10 @@ class PimpPackage_installer(PimpPackage): def installPackageOnly(self, output=None): """Install a single source package. - + If output is given it should be a file-like object and it will receive a log of what happened.""" - + if self._dict.has_key('Post-install-command'): return "%s: Installer package cannot have Post-install-command" % self.fullname() @@ -918,7 +918,7 @@ class PimpPackage_installer(PimpPackage): if _cmd(output, '/tmp', self._dict['Pre-install-command']): return "pre-install %s: running \"%s\" failed" % \ (self.fullname(), self._dict['Pre-install-command']) - + self.beforeInstall() installcmd = self._dict.get('Install-command') @@ -926,7 +926,7 @@ class PimpPackage_installer(PimpPackage): if '%' in installcmd: installcmd = installcmd % self.archiveFilename else: - installcmd = 'open \"%s\"' % self.archiveFilename + installcmd = 'open \"%s\"' % self.archiveFilename if _cmd(output, "/tmp", installcmd): return '%s: install command failed (use verbose for details)' % self.fullname() return '%s: downloaded and opened. Install manually and restart Package Manager' % self.archiveFilename diff --git a/Lib/test/inspect_fodder2.py b/Lib/test/inspect_fodder2.py index ce42929..44c7572 100644 --- a/Lib/test/inspect_fodder2.py +++ b/Lib/test/inspect_fodder2.py @@ -1,25 +1,25 @@ # line 1 def wrap(foo=None): - def wrapper(func): - return func - return wrapper + def wrapper(func): + return func + return wrapper # line 7 def replace(func): - def insteadfunc(): - print 'hello' - return insteadfunc + def insteadfunc(): + print 'hello' + return insteadfunc # line 13 @wrap() @wrap(wrap) def wrapped(): - pass + pass # line 19 @replace def gone(): - pass + pass # line 24 oll = lambda m: m diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index a671d7e..6c47c6e 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -33,7 +33,7 @@ class Test_Csv(unittest.TestCase): self.assertRaises(TypeError, ctor, arg, quoting=None) # We now allow this, only raising an exception if quoting is needed. # self.assertRaises(TypeError, ctor, arg, quotechar=None) -# self.assertRaises(TypeError, ctor, arg, +# self.assertRaises(TypeError, ctor, arg, # quoting=csv.QUOTE_NONE, escapechar=None) # No longer complains about dialects with invalid attributes [AM] # class BadDialect: diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 04f22b4..9e60a9c 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -31,11 +31,11 @@ class IsTestBase(unittest.TestCase): predicates = set([inspect.isbuiltin, inspect.isclass, inspect.iscode, inspect.isframe, inspect.isfunction, inspect.ismethod, inspect.ismodule, inspect.istraceback]) - + def istest(self, predicate, exp): obj = eval(exp) self.failUnless(predicate(obj), '%s(%s)' % (predicate.__name__, exp)) - + for other in self.predicates - set([predicate]): self.failIf(other(obj), 'not %s(%s)' % (other.__name__, exp)) @@ -44,7 +44,7 @@ class TestPredicates(IsTestBase): # Doc/lib/libinspect.tex claims there are 11 such functions count = len(filter(lambda x:x.startswith('is'), dir(inspect))) self.assertEqual(count, 11, "There are %d (not 11) is* functions" % count) - + def test_excluding_predicates(self): self.istest(inspect.isbuiltin, 'sys.exit') self.istest(inspect.isbuiltin, '[].append') @@ -66,7 +66,7 @@ class TestPredicates(IsTestBase): class TestInterpreterStack(IsTestBase): def __init__(self, *args, **kwargs): unittest.TestCase.__init__(self, *args, **kwargs) - + git.abuse(7, 8, 9) def test_abuse_done(self): @@ -76,7 +76,7 @@ class TestInterpreterStack(IsTestBase): def test_stack(self): self.assert_(len(mod.st) >= 5) self.assertEqual(mod.st[0][1:], - (modfile, 16, 'eggs', [' st = inspect.stack()\n'], 0)) + (modfile, 16, 'eggs', [' st = inspect.stack()\n'], 0)) self.assertEqual(mod.st[1][1:], (modfile, 9, 'spam', [' eggs(b + d, c + f)\n'], 0)) self.assertEqual(mod.st[2][1:], @@ -113,7 +113,7 @@ class TestInterpreterStack(IsTestBase): class GetSourceBase(unittest.TestCase): # Subclasses must override. fodderFile = None - + def __init__(self, *args, **kwargs): unittest.TestCase.__init__(self, *args, **kwargs) @@ -126,10 +126,10 @@ class GetSourceBase(unittest.TestCase): def assertSourceEqual(self, obj, top, bottom): self.assertEqual(inspect.getsource(obj), self.sourcerange(top, bottom)) - + class TestRetrievingSourceCode(GetSourceBase): fodderFile = mod - + def test_getclasses(self): classes = inspect.getmembers(mod, inspect.isclass) self.assertEqual(classes, @@ -147,7 +147,7 @@ class TestRetrievingSourceCode(GetSourceBase): ] ] ]) - + def test_getfunctions(self): functions = inspect.getmembers(mod, inspect.isfunction) self.assertEqual(functions, [('eggs', mod.eggs), @@ -172,8 +172,8 @@ class TestRetrievingSourceCode(GetSourceBase): self.assertSourceEqual(mod.StupidGit, 21, 46) def test_getsourcefile(self): - self.assertEqual(inspect.getsourcefile(mod.spam), modfile) - self.assertEqual(inspect.getsourcefile(git.abuse), modfile) + self.assertEqual(inspect.getsourcefile(mod.spam), modfile) + self.assertEqual(inspect.getsourcefile(git.abuse), modfile) def test_getfile(self): self.assertEqual(inspect.getfile(mod.StupidGit), mod.__file__) @@ -192,38 +192,38 @@ class TestOneliners(GetSourceBase): def test_oneline_lambda(self): # Test inspect.getsource with a one-line lambda function. self.assertSourceEqual(mod2.oll, 25, 25) - + def test_threeline_lambda(self): # Test inspect.getsource with a three-line lambda function, # where the second and third lines are _not_ indented. - self.assertSourceEqual(mod2.tll, 28, 30) - + self.assertSourceEqual(mod2.tll, 28, 30) + def test_twoline_indented_lambda(self): # Test inspect.getsource with a two-line lambda function, # where the second line _is_ indented. self.assertSourceEqual(mod2.tlli, 33, 34) - + def test_onelinefunc(self): # Test inspect.getsource with a regular one-line function. self.assertSourceEqual(mod2.onelinefunc, 37, 37) - + def test_manyargs(self): # Test inspect.getsource with a regular function where # the arguments are on two lines and _not_ indented and # the body on the second line with the last arguments. self.assertSourceEqual(mod2.manyargs, 40, 41) - + def test_twolinefunc(self): # Test inspect.getsource with a regular function where # the body is on two lines, following the argument list and # continued on the next line by a \\. self.assertSourceEqual(mod2.twolinefunc, 44, 45) - + def test_lambda_in_list(self): # Test inspect.getsource with a one-line lambda function # defined in a list, indented. self.assertSourceEqual(mod2.a[1], 49, 49) - + def test_anonymous(self): # Test inspect.getsource with a lambda function defined # as argument to another function. @@ -233,7 +233,7 @@ class TestOneliners(GetSourceBase): def attrs_wo_objs(cls): return [t[:3] for t in inspect.classify_class_attrs(cls)] -class TestClassesAndFunctions(unittest.TestCase): +class TestClassesAndFunctions(unittest.TestCase): def test_classic_mro(self): # Test classic-class method resolution order. class A: pass @@ -284,7 +284,7 @@ class TestClassesAndFunctions(unittest.TestCase): def test_getargspec_sublistofone(self): def sublistOfOne((foo)): return 1 - + self.assertArgSpecEquals(sublistOfOne, [['foo']]) def test_classify_oldstyle(self): @@ -418,4 +418,3 @@ def test_main(): if __name__ == "__main__": test_main() - diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index b4bf77e..e91184e 100644 --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -299,7 +299,7 @@ class CompressObjectTestCase(unittest.TestCase): self.failUnless(co.flush()) # Returns a zlib header dco = zlib.decompressobj() self.assertEqual(dco.flush(), "") # Returns nothing - + def genblock(seed, length, step=1024, generator=random): """length-byte stream of random data from a seed (in step-byte blocks).""" diff --git a/Mac/OSX/fixapplepython23.py b/Mac/OSX/fixapplepython23.py index ce54890..181181e 100644 --- a/Mac/OSX/fixapplepython23.py +++ b/Mac/OSX/fixapplepython23.py @@ -43,12 +43,12 @@ def findline(lines, start): if lines[i][:len(start)] == start: return i return -1 - + def fix(makefile, do_apply): """Fix the Makefile, if required.""" fixed = False lines = open(makefile).readlines() - + for old, new in CHANGES: i = findline(lines, new) if i >= 0: @@ -61,7 +61,7 @@ def fix(makefile, do_apply): return 2 lines[i] = new fixed = True - + if fixed: if do_apply: print 'fixapplepython23: Fix to Apple-installed Python 2.3 applied' @@ -74,7 +74,7 @@ def fix(makefile, do_apply): else: print 'fixapplepython23: No fix needed, appears to have been applied before' return 0 - + def makescript(filename, compiler): """Create a wrapper script for a compiler""" dirname = os.path.split(filename)[0] @@ -85,7 +85,7 @@ def makescript(filename, compiler): fp.close() os.chmod(filename, 0755) print 'fixapplepython23: Created', filename - + def main(): # Check for -n option if len(sys.argv) > 1 and sys.argv[1] == '-n': @@ -113,7 +113,6 @@ def main(): # Finally fix the makefile rv = fix(MAKEFILE, do_apply) sys.exit(rv) - + if __name__ == '__main__': main() - diff --git a/Tools/i18n/makelocalealias.py b/Tools/i18n/makelocalealias.py index 743185b..43df35a 100644 --- a/Tools/i18n/makelocalealias.py +++ b/Tools/i18n/makelocalealias.py @@ -62,7 +62,7 @@ def print_differences(data, olddata): print '# updated %r -> %r to %r' % \ (k, olddata[k], data[k]) # Additions are not mentioned - + if __name__ == '__main__': data = locale.locale_alias.copy() data.update(parse(LOCALE_ALIAS)) @@ -71,4 +71,3 @@ if __name__ == '__main__': print 'locale_alias = {' pprint(data) print '}' - diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index dbb7ecb..bd23f96 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -977,7 +977,7 @@ def add_files(db): lib.add_file('python%s%s.lib' % (major, minor)) # Add the mingw-format library if have_mingw: - lib.add_file('libpython%s%s.a' % (major, minor)) + lib.add_file('libpython%s%s.a' % (major, minor)) if have_tcl: # Add Tcl/Tk tcldirs = [(root, '../tcltk/lib', 'tcl')] |