From: Anthony Baxter Date: Fri, 3 Jun 2005 14:10:50 +0000 (+0000) Subject: whitespace normalisation X-Git-Tag: v2.4.2c1~208 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5298ade7a54a5005a79fb0752847cb4ca57a8169;p=thirdparty%2FPython%2Fcpython.git whitespace normalisation --- diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py index d13f1e4ccf3d..ea913c7f8092 100644 --- a/Lib/idlelib/configHandler.py +++ b/Lib/idlelib/configHandler.py @@ -193,7 +193,7 @@ class IdleConf: """ Creates (if required) and returns a filesystem directory for storing user config files. - + """ cfgDir = '.idlerc' userDir = os.path.expanduser('~') diff --git a/Lib/plat-mac/bundlebuilder.py b/Lib/plat-mac/bundlebuilder.py index e3795441c54a..03d8c81776d7 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 255b57cceefc..21923ec55087 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/regrtest.py b/Lib/test/regrtest.py index 20407f8bd3c2..6160b3d07d50 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -93,7 +93,7 @@ resources to test. Currently only the following are defined: in the standard library and test suite. This takes a long time. - subprocess Run all tests for the subprocess module. + subprocess Run all tests for the subprocess module. To enable all resources except one, use '-uall,-'. For example, to run all the tests except for the bsddb tests, give the diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index e79dbdeac8ed..6dcb8e440f01 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -346,7 +346,7 @@ class ProcessTestCase(unittest.TestCase): if test_support.is_resource_enabled("subprocess") and not mswindows: max_handles = 1026 # too much for most UNIX systems else: - max_handles = 65 + max_handles = 65 for i in range(max_handles): p = subprocess.Popen([sys.executable, "-c", "import sys;sys.stdout.write(sys.stdin.read())"], diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index b4bf77ea0116..e91184e1b718 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)."""