diff options
| -rw-r--r-- | Lib/distutils/dir_util.py | 2 | ||||
| -rw-r--r-- | Lib/hashlib.py | 1 | ||||
| -rw-r--r-- | Lib/random.py | 2 | ||||
| -rw-r--r-- | Lib/test/seq_tests.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_generators.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_hashlib_speed.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_mmap.py | 2 | ||||
| -rw-r--r-- | Lib/urllib2.py | 4 | ||||
| -rwxr-xr-x | Tools/scripts/findnocoding.py | 14 | ||||
| -rw-r--r-- | Tools/scripts/pysource.py | 8 |
10 files changed, 19 insertions, 23 deletions
diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py index 2248b60..43994db 100644 --- a/Lib/distutils/dir_util.py +++ b/Lib/distutils/dir_util.py @@ -31,7 +31,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0): global _path_created # Detect a common bug -- name is None - if not isinstance(name, StringTypes): + if not isinstance(name, StringTypes): raise DistutilsInternalError, \ "mkpath: 'name' must be a string (got %r)" % (name,) diff --git a/Lib/hashlib.py b/Lib/hashlib.py index 3528699..48fc56c 100644 --- a/Lib/hashlib.py +++ b/Lib/hashlib.py @@ -107,4 +107,3 @@ except ImportError: sha256 = __get_builtin_constructor('sha256') sha384 = __get_builtin_constructor('sha384') sha512 = __get_builtin_constructor('sha512') - diff --git a/Lib/random.py b/Lib/random.py index 3e6941e..b4ad2b3 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -303,7 +303,7 @@ class Random(_random.Random): result = [None] * k setsize = 21 # size of a small set minus size of an empty list if k > 5: - setsize += 4 ** _ceil(_log(k * 3, 4)) # table size for big sets + setsize += 4 ** _ceil(_log(k * 3, 4)) # table size for big sets if n <= setsize: # is an n-length list smaller than a k-length set pool = list(population) for i in xrange(k): # invariant: non-selected at [0,n-i) diff --git a/Lib/test/seq_tests.py b/Lib/test/seq_tests.py index ae5bba3..18fb3b7 100644 --- a/Lib/test/seq_tests.py +++ b/Lib/test/seq_tests.py @@ -228,7 +228,7 @@ class CommonTest(unittest.TestCase): class StopCompares: def __eq__(self, other): raise DoNotTestEq - + checkfirst = self.type2test([1, StopCompares()]) self.assert_(1 in checkfirst) checklast = self.type2test([StopCompares(), 1]) diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index fb88ffa..d226043 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -709,18 +709,18 @@ are quite straightforwardly expressed with this Python idiom. Ye olde Fibonacci generator, tee style. >>> def fib(): -... +... ... def _isum(g, h): ... while 1: ... yield g.next() + h.next() -... +... ... def _fib(): ... yield 1 ... yield 2 ... fibTail.next() # throw first away ... for res in _isum(fibHead, fibTail): ... yield res -... +... ... fibHead, fibTail, fibRes = tee(_fib(), 3) ... return fibRes diff --git a/Lib/test/test_hashlib_speed.py b/Lib/test/test_hashlib_speed.py index a62d923..c84a62b 100644 --- a/Lib/test/test_hashlib_speed.py +++ b/Lib/test/test_hashlib_speed.py @@ -90,4 +90,3 @@ test_scaled_msg(scale=212, name='[2*small data]') test_scaled_msg(scale=106, name='[small data]') test_scaled_msg(scale=creatorFunc().digest_size, name='[digest_size data]') test_scaled_msg(scale=10, name='[tiny data]') - diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index a0386ef..0b9cea9 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -126,7 +126,7 @@ def test_both(): f.seek(0, 2) verify(f.tell() == 512, 'Underlying file not truncated') f.close() - verify(m.size() == 512, 'New size not reflected in file') + verify(m.size() == 512, 'New size not reflected in file') m.close() diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 84b4bb3..015fdb5 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -1069,7 +1069,7 @@ def parse_keqv_list(l): def parse_http_list(s): """Parse lists as described by RFC 2068 Section 2. - + In particular, parse comma-separated lists where the elements of the list may include quoted-strings. A quoted-string could contain a comma. A non-quoted string could have quotes in the @@ -1101,7 +1101,7 @@ def parse_http_list(s): if cur == '"': quote = True - + part += cur # append last part diff --git a/Tools/scripts/findnocoding.py b/Tools/scripts/findnocoding.py index 707bf23..e8fc619 100755 --- a/Tools/scripts/findnocoding.py +++ b/Tools/scripts/findnocoding.py @@ -26,8 +26,8 @@ except: if filename.endswith(".py"): yield os.path.join(root, filename) pysource = pysource() - - + + print >>sys.stderr, ("The pysource module is not available; " "no sophisticated Python source file search will be done.") @@ -56,19 +56,19 @@ def needs_declaration(fullpath): line1 = infile.readline() line2 = infile.readline() - + if get_declaration(line1) or get_declaration(line2): # the file does have an encoding declaration, so trust it infile.close() return False - + # check the whole file for non-ASCII characters rest = infile.read() infile.close() - + if has_correct_encoding(line1+line2+rest, "ascii"): return False - + return True @@ -102,5 +102,3 @@ for fullpath in pysource.walk_python_files(args, is_python): result = needs_declaration(fullpath) if result: print fullpath - - diff --git a/Tools/scripts/pysource.py b/Tools/scripts/pysource.py index 3b01bfc..d5eb515 100644 --- a/Tools/scripts/pysource.py +++ b/Tools/scripts/pysource.py @@ -57,12 +57,12 @@ def looks_like_python(fullpath): line = infile.readline() infile.close() - + if binary_re.search(line): # file appears to be binary print_debug("%s: appears to be binary" % fullpath) return False - + if fullpath.endswith(".py") or fullpath.endswith(".pyw"): return True elif "python" in line: @@ -95,12 +95,12 @@ def walk_python_files(paths, is_python=looks_like_python, exclude_dirs=None): paths: a list of files and/or directories to be checked. is_python: a function that takes a file name and checks whether it is a Python source file - exclude_dirs: a list of directory base names that should be excluded in + exclude_dirs: a list of directory base names that should be excluded in the search """ if exclude_dirs is None: exclude_dirs=[] - + for path in paths: print_debug("testing: %s" % path) if os.path.isfile(path): |