[Python-checkins] r43260 - in python/branches/release24-maint: Lib/bsddb/__init__.py Lib/codecs.py Lib/distutils/dir_util.py Lib/locale.py Lib/test/test_minidom.py Lib/test/test_mmap.py Lib/test/test_poll.py Lib/urllib2.py Mac/OSX/Doc/setup.py Mac/OSX/fixapplepython23.py Tools/msi/msi.py setup.py
tim.peters
python-checkins at python.org
Thu Mar 23 20:07:50 CET 2006
Author: tim.peters
Date: Thu Mar 23 20:07:46 2006
New Revision: 43260
Modified:
python/branches/release24-maint/Lib/bsddb/__init__.py
python/branches/release24-maint/Lib/codecs.py
python/branches/release24-maint/Lib/distutils/dir_util.py
python/branches/release24-maint/Lib/locale.py
python/branches/release24-maint/Lib/test/test_minidom.py
python/branches/release24-maint/Lib/test/test_mmap.py
python/branches/release24-maint/Lib/test/test_poll.py
python/branches/release24-maint/Lib/urllib2.py
python/branches/release24-maint/Mac/OSX/Doc/setup.py
python/branches/release24-maint/Mac/OSX/fixapplepython23.py
python/branches/release24-maint/Tools/msi/msi.py
python/branches/release24-maint/setup.py
Log:
Mechanical whitespace normalization.
Modified: python/branches/release24-maint/Lib/bsddb/__init__.py
==============================================================================
--- python/branches/release24-maint/Lib/bsddb/__init__.py (original)
+++ python/branches/release24-maint/Lib/bsddb/__init__.py Thu Mar 23 20:07:46 2006
@@ -195,7 +195,7 @@
try:
self.saved_dbc_key = c.current(0,0,0)[0]
except db.DBError:
- pass
+ pass
c.close()
del c
for cref in self._cursor_refs.values():
Modified: python/branches/release24-maint/Lib/codecs.py
==============================================================================
--- python/branches/release24-maint/Lib/codecs.py (original)
+++ python/branches/release24-maint/Lib/codecs.py Thu Mar 23 20:07:46 2006
@@ -269,7 +269,7 @@
if self.linebuffer:
self.charbuffer = "".join(self.linebuffer)
self.linebuffer = None
-
+
# read until we get the required number of characters (if available)
while True:
# can the request can be satisfied from the character buffer?
@@ -338,7 +338,7 @@
if not keepends:
line = line.splitlines(False)[0]
return line
-
+
readsize = size or 72
line = ""
# If size is given, we call read() only once
Modified: python/branches/release24-maint/Lib/distutils/dir_util.py
==============================================================================
--- python/branches/release24-maint/Lib/distutils/dir_util.py (original)
+++ python/branches/release24-maint/Lib/distutils/dir_util.py Thu Mar 23 20:07:46 2006
@@ -31,7 +31,7 @@
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,)
Modified: python/branches/release24-maint/Lib/locale.py
==============================================================================
--- python/branches/release24-maint/Lib/locale.py (original)
+++ python/branches/release24-maint/Lib/locale.py Thu Mar 23 20:07:46 2006
@@ -663,7 +663,7 @@
#
# This maps Windows language identifiers to locale strings.
#
-# This list has been updated from
+# This list has been updated from
# http://msdn.microsoft.com/library/default.asp?url=/library/en-us/intl/nls_238z.asp
# to include every locale up to Windows XP.
#
Modified: python/branches/release24-maint/Lib/test/test_minidom.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_minidom.py (original)
+++ python/branches/release24-maint/Lib/test/test_minidom.py Thu Mar 23 20:07:46 2006
@@ -1135,9 +1135,9 @@
# Check that replacing a child with itself leaves the tree unchanged
elem.replaceChild(e, e)
confirm(e.parentNode is elem, "After replaceChild()")
-
-
-
+
+
+
def testReplaceWholeText():
def setup():
doc = parseString("<doc>a<e/>d</doc>")
Modified: python/branches/release24-maint/Lib/test/test_mmap.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_mmap.py (original)
+++ python/branches/release24-maint/Lib/test/test_mmap.py Thu Mar 23 20:07:46 2006
@@ -126,7 +126,7 @@
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()
Modified: python/branches/release24-maint/Lib/test/test_poll.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_poll.py (original)
+++ python/branches/release24-maint/Lib/test/test_poll.py Thu Mar 23 20:07:46 2006
@@ -185,7 +185,7 @@
if x != 5:
print 'Overflow must have occurred'
print 'Poll test 3 complete'
-
+
test_poll1()
test_poll2()
Modified: python/branches/release24-maint/Lib/urllib2.py
==============================================================================
--- python/branches/release24-maint/Lib/urllib2.py (original)
+++ python/branches/release24-maint/Lib/urllib2.py Thu Mar 23 20:07:46 2006
@@ -1064,7 +1064,7 @@
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
@@ -1096,7 +1096,7 @@
if cur == '"':
quote = True
-
+
part += cur
# append last part
Modified: python/branches/release24-maint/Mac/OSX/Doc/setup.py
==============================================================================
--- python/branches/release24-maint/Mac/OSX/Doc/setup.py (original)
+++ python/branches/release24-maint/Mac/OSX/Doc/setup.py Thu Mar 23 20:07:46 2006
@@ -57,7 +57,7 @@
(self.doc_version,self.doc_version)
tarfile = 'html-%s.tar.bz2' % self.doc_version
dirname = 'Python-Docs-%s' % self.doc_version
-
+
if os.path.exists(self.build_html):
raise RuntimeError, '%s: already exists, please remove and try again' % self.build_html
os.chdir(self.build_base)
Modified: python/branches/release24-maint/Mac/OSX/fixapplepython23.py
==============================================================================
--- python/branches/release24-maint/Mac/OSX/fixapplepython23.py (original)
+++ python/branches/release24-maint/Mac/OSX/fixapplepython23.py Thu Mar 23 20:07:46 2006
@@ -43,12 +43,12 @@
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 @@
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 @@
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 @@
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 @@
# Finally fix the makefile
rv = fix(MAKEFILE, do_apply)
sys.exit(rv)
-
+
if __name__ == '__main__':
main()
-
Modified: python/branches/release24-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release24-maint/Tools/msi/msi.py (original)
+++ python/branches/release24-maint/Tools/msi/msi.py Thu Mar 23 20:07:46 2006
@@ -134,7 +134,7 @@
"24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}",
"25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}"
} [major+minor]
-
+
# Build the mingw import library, libpythonXY.a
# This requires 'nm' and 'dlltool' executables on your PATH
Modified: python/branches/release24-maint/setup.py
==============================================================================
--- python/branches/release24-maint/setup.py (original)
+++ python/branches/release24-maint/setup.py Thu Mar 23 20:07:46 2006
@@ -159,7 +159,7 @@
line = line.split()
remove_modules.append(line[0])
input.close()
-
+
for ext in self.extensions[:]:
if ext.name in remove_modules:
self.extensions.remove(ext)
More information about the Python-checkins
mailing list