[Python-checkins] r43052 - in python/trunk/Lib: encodings/__init__.py encodings/cp037.py encodings/cp1006.py encodings/cp1026.py encodings/cp1140.py encodings/cp1250.py encodings/cp1251.py encodings/cp1252.py encodings/cp1253.py encodings/cp1254.py encodings/cp1255.py encodings/cp1256.py encodings/cp1257.py encodings/cp1258.py encodings/cp424.py encodings/cp500.py encodings/cp856.py encodings/cp874.py encodings/cp875.py encodings/iso8859_1.py encodings/iso8859_10.py encodings/iso8859_11.py encodings/iso8859_13.py encodings/iso8859_14.py encodings/iso8859_15.py encodings/iso8859_16.py encodings/iso8859_2.py encodings/iso8859_3.py encodings/iso8859_4.py encodings/iso8859_5.py encodings/iso8859_6.py encodings/iso8859_7.py encodings/iso8859_8.py encodings/iso8859_9.py encodings/koi8_r.py encodings/koi8_u.py encodings/latin_1.py encodings/mac_centeuro.py encodings/mac_croatian.py encodings/mac_cyrillic.py encodings/mac_farsi.py encodings/mac_greek.py encodings/mac_iceland.py encodings/mac_roman.py encodings/mac_romanian.py encodings/mac_turkish.py encodings/tis_620.py encodings/utf_7.py runpy.py test/test_runpy.py
tim.peters
python-checkins at python.org
Wed Mar 15 19:08:40 CET 2006
Author: tim.peters
Date: Wed Mar 15 19:08:37 2006
New Revision: 43052
Modified:
python/trunk/Lib/encodings/__init__.py
python/trunk/Lib/encodings/cp037.py
python/trunk/Lib/encodings/cp1006.py
python/trunk/Lib/encodings/cp1026.py
python/trunk/Lib/encodings/cp1140.py
python/trunk/Lib/encodings/cp1250.py
python/trunk/Lib/encodings/cp1251.py
python/trunk/Lib/encodings/cp1252.py
python/trunk/Lib/encodings/cp1253.py
python/trunk/Lib/encodings/cp1254.py
python/trunk/Lib/encodings/cp1255.py
python/trunk/Lib/encodings/cp1256.py
python/trunk/Lib/encodings/cp1257.py
python/trunk/Lib/encodings/cp1258.py
python/trunk/Lib/encodings/cp424.py
python/trunk/Lib/encodings/cp500.py
python/trunk/Lib/encodings/cp856.py
python/trunk/Lib/encodings/cp874.py
python/trunk/Lib/encodings/cp875.py
python/trunk/Lib/encodings/iso8859_1.py
python/trunk/Lib/encodings/iso8859_10.py
python/trunk/Lib/encodings/iso8859_11.py
python/trunk/Lib/encodings/iso8859_13.py
python/trunk/Lib/encodings/iso8859_14.py
python/trunk/Lib/encodings/iso8859_15.py
python/trunk/Lib/encodings/iso8859_16.py
python/trunk/Lib/encodings/iso8859_2.py
python/trunk/Lib/encodings/iso8859_3.py
python/trunk/Lib/encodings/iso8859_4.py
python/trunk/Lib/encodings/iso8859_5.py
python/trunk/Lib/encodings/iso8859_6.py
python/trunk/Lib/encodings/iso8859_7.py
python/trunk/Lib/encodings/iso8859_8.py
python/trunk/Lib/encodings/iso8859_9.py
python/trunk/Lib/encodings/koi8_r.py
python/trunk/Lib/encodings/koi8_u.py
python/trunk/Lib/encodings/latin_1.py
python/trunk/Lib/encodings/mac_centeuro.py
python/trunk/Lib/encodings/mac_croatian.py
python/trunk/Lib/encodings/mac_cyrillic.py
python/trunk/Lib/encodings/mac_farsi.py
python/trunk/Lib/encodings/mac_greek.py
python/trunk/Lib/encodings/mac_iceland.py
python/trunk/Lib/encodings/mac_roman.py
python/trunk/Lib/encodings/mac_romanian.py
python/trunk/Lib/encodings/mac_turkish.py
python/trunk/Lib/encodings/tis_620.py
python/trunk/Lib/encodings/utf_7.py
python/trunk/Lib/runpy.py
python/trunk/Lib/test/test_runpy.py
Log:
Whitespace normalization.
Modified: python/trunk/Lib/encodings/__init__.py
==============================================================================
--- python/trunk/Lib/encodings/__init__.py (original)
+++ python/trunk/Lib/encodings/__init__.py Wed Mar 15 19:08:37 2006
@@ -117,9 +117,9 @@
entry = getregentry()
if not isinstance(entry, codecs.CodecInfo):
if not 4 <= len(entry) <= 7:
- raise CodecRegistryError,\
- 'module "%s" (%s) failed to register' % \
- (mod.__name__, mod.__file__)
+ raise CodecRegistryError,\
+ 'module "%s" (%s) failed to register' % \
+ (mod.__name__, mod.__file__)
if not callable(entry[0]) or \
not callable(entry[1]) or \
(entry[2] is not None and not callable(entry[2])) or \
Modified: python/trunk/Lib/encodings/cp037.py
==============================================================================
--- python/trunk/Lib/encodings/cp037.py (original)
+++ python/trunk/Lib/encodings/cp037.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x00FE: 0x8E, # LATIN SMALL LETTER THORN (ICELANDIC)
0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS
}
-
Modified: python/trunk/Lib/encodings/cp1006.py
==============================================================================
--- python/trunk/Lib/encodings/cp1006.py (original)
+++ python/trunk/Lib/encodings/cp1006.py Wed Mar 15 19:08:37 2006
@@ -562,4 +562,3 @@
0xFEF2: 0xFA, # ARABIC LETTER YEH FINAL FORM
0xFEF3: 0xFB, # ARABIC LETTER YEH INITIAL FORM
}
-
Modified: python/trunk/Lib/encodings/cp1026.py
==============================================================================
--- python/trunk/Lib/encodings/cp1026.py (original)
+++ python/trunk/Lib/encodings/cp1026.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x015E: 0x7C, # LATIN CAPITAL LETTER S WITH CEDILLA
0x015F: 0x6A, # LATIN SMALL LETTER S WITH CEDILLA
}
-
Modified: python/trunk/Lib/encodings/cp1140.py
==============================================================================
--- python/trunk/Lib/encodings/cp1140.py (original)
+++ python/trunk/Lib/encodings/cp1140.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS
0x20AC: 0x9F, # EURO SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1250.py
==============================================================================
--- python/trunk/Lib/encodings/cp1250.py (original)
+++ python/trunk/Lib/encodings/cp1250.py Wed Mar 15 19:08:37 2006
@@ -558,4 +558,3 @@
0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1251.py
==============================================================================
--- python/trunk/Lib/encodings/cp1251.py (original)
+++ python/trunk/Lib/encodings/cp1251.py Wed Mar 15 19:08:37 2006
@@ -562,4 +562,3 @@
0x2116: 0xB9, # NUMERO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1252.py
==============================================================================
--- python/trunk/Lib/encodings/cp1252.py (original)
+++ python/trunk/Lib/encodings/cp1252.py Wed Mar 15 19:08:37 2006
@@ -558,4 +558,3 @@
0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1253.py
==============================================================================
--- python/trunk/Lib/encodings/cp1253.py (original)
+++ python/trunk/Lib/encodings/cp1253.py Wed Mar 15 19:08:37 2006
@@ -546,4 +546,3 @@
0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1254.py
==============================================================================
--- python/trunk/Lib/encodings/cp1254.py (original)
+++ python/trunk/Lib/encodings/cp1254.py Wed Mar 15 19:08:37 2006
@@ -556,4 +556,3 @@
0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1255.py
==============================================================================
--- python/trunk/Lib/encodings/cp1255.py (original)
+++ python/trunk/Lib/encodings/cp1255.py Wed Mar 15 19:08:37 2006
@@ -540,4 +540,3 @@
0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1256.py
==============================================================================
--- python/trunk/Lib/encodings/cp1256.py (original)
+++ python/trunk/Lib/encodings/cp1256.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1257.py
==============================================================================
--- python/trunk/Lib/encodings/cp1257.py (original)
+++ python/trunk/Lib/encodings/cp1257.py Wed Mar 15 19:08:37 2006
@@ -551,4 +551,3 @@
0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp1258.py
==============================================================================
--- python/trunk/Lib/encodings/cp1258.py (original)
+++ python/trunk/Lib/encodings/cp1258.py Wed Mar 15 19:08:37 2006
@@ -554,4 +554,3 @@
0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN
}
-
Modified: python/trunk/Lib/encodings/cp424.py
==============================================================================
--- python/trunk/Lib/encodings/cp424.py (original)
+++ python/trunk/Lib/encodings/cp424.py Wed Mar 15 19:08:37 2006
@@ -525,4 +525,3 @@
0x05EA: 0x71, # HEBREW LETTER TAV
0x2017: 0x78, # DOUBLE LOW LINE
}
-
Modified: python/trunk/Lib/encodings/cp500.py
==============================================================================
--- python/trunk/Lib/encodings/cp500.py (original)
+++ python/trunk/Lib/encodings/cp500.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x00FE: 0x8E, # LATIN SMALL LETTER THORN (ICELANDIC)
0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS
}
-
Modified: python/trunk/Lib/encodings/cp856.py
==============================================================================
--- python/trunk/Lib/encodings/cp856.py (original)
+++ python/trunk/Lib/encodings/cp856.py Wed Mar 15 19:08:37 2006
@@ -522,4 +522,3 @@
0x2593: 0xB2, # DARK SHADE
0x25A0: 0xFE, # BLACK SQUARE
}
-
Modified: python/trunk/Lib/encodings/cp874.py
==============================================================================
--- python/trunk/Lib/encodings/cp874.py (original)
+++ python/trunk/Lib/encodings/cp874.py Wed Mar 15 19:08:37 2006
@@ -532,4 +532,3 @@
0x2026: 0x85, # HORIZONTAL ELLIPSIS
0x20AC: 0x80, # EURO SIGN
}
-
Modified: python/trunk/Lib/encodings/cp875.py
==============================================================================
--- python/trunk/Lib/encodings/cp875.py (original)
+++ python/trunk/Lib/encodings/cp875.py Wed Mar 15 19:08:37 2006
@@ -557,4 +557,3 @@
0x2018: 0xCE, # LEFT SINGLE QUOTATION MARK
0x2019: 0xDE, # RIGHT SINGLE QUOTATION MARK
}
-
Modified: python/trunk/Lib/encodings/iso8859_1.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_1.py (original)
+++ python/trunk/Lib/encodings/iso8859_1.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x00FE: 0xFE, # LATIN SMALL LETTER THORN (Icelandic)
0x00FF: 0xFF, # LATIN SMALL LETTER Y WITH DIAERESIS
}
-
Modified: python/trunk/Lib/encodings/iso8859_10.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_10.py (original)
+++ python/trunk/Lib/encodings/iso8859_10.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x017E: 0xBC, # LATIN SMALL LETTER Z WITH CARON
0x2015: 0xBD, # HORIZONTAL BAR
}
-
Modified: python/trunk/Lib/encodings/iso8859_11.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_11.py (original)
+++ python/trunk/Lib/encodings/iso8859_11.py Wed Mar 15 19:08:37 2006
@@ -555,4 +555,3 @@
0x0E5A: 0xFA, # THAI CHARACTER ANGKHANKHU
0x0E5B: 0xFB, # THAI CHARACTER KHOMUT
}
-
Modified: python/trunk/Lib/encodings/iso8859_13.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_13.py (original)
+++ python/trunk/Lib/encodings/iso8859_13.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x201D: 0xA1, # RIGHT DOUBLE QUOTATION MARK
0x201E: 0xA5, # DOUBLE LOW-9 QUOTATION MARK
}
-
Modified: python/trunk/Lib/encodings/iso8859_14.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_14.py (original)
+++ python/trunk/Lib/encodings/iso8859_14.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x1EF2: 0xAC, # LATIN CAPITAL LETTER Y WITH GRAVE
0x1EF3: 0xBC, # LATIN SMALL LETTER Y WITH GRAVE
}
-
Modified: python/trunk/Lib/encodings/iso8859_15.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_15.py (original)
+++ python/trunk/Lib/encodings/iso8859_15.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x017E: 0xB8, # LATIN SMALL LETTER Z WITH CARON
0x20AC: 0xA4, # EURO SIGN
}
-
Modified: python/trunk/Lib/encodings/iso8859_16.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_16.py (original)
+++ python/trunk/Lib/encodings/iso8859_16.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x201E: 0xA5, # DOUBLE LOW-9 QUOTATION MARK
0x20AC: 0xA4, # EURO SIGN
}
-
Modified: python/trunk/Lib/encodings/iso8859_2.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_2.py (original)
+++ python/trunk/Lib/encodings/iso8859_2.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x02DB: 0xB2, # OGONEK
0x02DD: 0xBD, # DOUBLE ACUTE ACCENT
}
-
Modified: python/trunk/Lib/encodings/iso8859_3.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_3.py (original)
+++ python/trunk/Lib/encodings/iso8859_3.py Wed Mar 15 19:08:37 2006
@@ -556,4 +556,3 @@
0x02D8: 0xA2, # BREVE
0x02D9: 0xFF, # DOT ABOVE
}
-
Modified: python/trunk/Lib/encodings/iso8859_4.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_4.py (original)
+++ python/trunk/Lib/encodings/iso8859_4.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x02D9: 0xFF, # DOT ABOVE
0x02DB: 0xB2, # OGONEK
}
-
Modified: python/trunk/Lib/encodings/iso8859_5.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_5.py (original)
+++ python/trunk/Lib/encodings/iso8859_5.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x045F: 0xFF, # CYRILLIC SMALL LETTER DZHE
0x2116: 0xF0, # NUMERO SIGN
}
-
Modified: python/trunk/Lib/encodings/iso8859_6.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_6.py (original)
+++ python/trunk/Lib/encodings/iso8859_6.py Wed Mar 15 19:08:37 2006
@@ -518,4 +518,3 @@
0x0651: 0xF1, # ARABIC SHADDA
0x0652: 0xF2, # ARABIC SUKUN
}
-
Modified: python/trunk/Lib/encodings/iso8859_7.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_7.py (original)
+++ python/trunk/Lib/encodings/iso8859_7.py Wed Mar 15 19:08:37 2006
@@ -560,4 +560,3 @@
0x20AC: 0xA4, # EURO SIGN
0x20AF: 0xA5, # DRACHMA SIGN
}
-
Modified: python/trunk/Lib/encodings/iso8859_8.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_8.py (original)
+++ python/trunk/Lib/encodings/iso8859_8.py Wed Mar 15 19:08:37 2006
@@ -527,4 +527,3 @@
0x200F: 0xFE, # RIGHT-TO-LEFT MARK
0x2017: 0xDF, # DOUBLE LOW LINE
}
-
Modified: python/trunk/Lib/encodings/iso8859_9.py
==============================================================================
--- python/trunk/Lib/encodings/iso8859_9.py (original)
+++ python/trunk/Lib/encodings/iso8859_9.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x015E: 0xDE, # LATIN CAPITAL LETTER S WITH CEDILLA
0x015F: 0xFE, # LATIN SMALL LETTER S WITH CEDILLA
}
-
Modified: python/trunk/Lib/encodings/koi8_r.py
==============================================================================
--- python/trunk/Lib/encodings/koi8_r.py (original)
+++ python/trunk/Lib/encodings/koi8_r.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x2593: 0x92, # DARK SHADE
0x25A0: 0x94, # BLACK SQUARE
}
-
Modified: python/trunk/Lib/encodings/koi8_u.py
==============================================================================
--- python/trunk/Lib/encodings/koi8_u.py (original)
+++ python/trunk/Lib/encodings/koi8_u.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x2593: 0x92, # DARK SHADE
0x25A0: 0x94, # BLACK SQUARE
}
-
Modified: python/trunk/Lib/encodings/latin_1.py
==============================================================================
--- python/trunk/Lib/encodings/latin_1.py (original)
+++ python/trunk/Lib/encodings/latin_1.py Wed Mar 15 19:08:37 2006
@@ -48,4 +48,3 @@
streamreader=StreamReader,
streamwriter=StreamWriter,
)
-
Modified: python/trunk/Lib/encodings/mac_centeuro.py
==============================================================================
--- python/trunk/Lib/encodings/mac_centeuro.py (original)
+++ python/trunk/Lib/encodings/mac_centeuro.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x2265: 0xB3, # GREATER-THAN OR EQUAL TO
0x25CA: 0xD7, # LOZENGE
}
-
Modified: python/trunk/Lib/encodings/mac_croatian.py
==============================================================================
--- python/trunk/Lib/encodings/mac_croatian.py (original)
+++ python/trunk/Lib/encodings/mac_croatian.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x25CA: 0xD7, # LOZENGE
0xF8FF: 0xD8, # Apple logo
}
-
Modified: python/trunk/Lib/encodings/mac_cyrillic.py
==============================================================================
--- python/trunk/Lib/encodings/mac_cyrillic.py (original)
+++ python/trunk/Lib/encodings/mac_cyrillic.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x2264: 0xB2, # LESS-THAN OR EQUAL TO
0x2265: 0xB3, # GREATER-THAN OR EQUAL TO
}
-
Modified: python/trunk/Lib/encodings/mac_farsi.py
==============================================================================
--- python/trunk/Lib/encodings/mac_farsi.py (original)
+++ python/trunk/Lib/encodings/mac_farsi.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x2026: 0x93, # HORIZONTAL ELLIPSIS, right-left
0x274A: 0xC0, # EIGHT TEARDROP-SPOKED PROPELLER ASTERISK, right-left
}
-
Modified: python/trunk/Lib/encodings/mac_greek.py
==============================================================================
--- python/trunk/Lib/encodings/mac_greek.py (original)
+++ python/trunk/Lib/encodings/mac_greek.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x2264: 0xB2, # LESS-THAN OR EQUAL TO
0x2265: 0xB3, # GREATER-THAN OR EQUAL TO
}
-
Modified: python/trunk/Lib/encodings/mac_iceland.py
==============================================================================
--- python/trunk/Lib/encodings/mac_iceland.py (original)
+++ python/trunk/Lib/encodings/mac_iceland.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x25CA: 0xD7, # LOZENGE
0xF8FF: 0xF0, # Apple logo
}
-
Modified: python/trunk/Lib/encodings/mac_roman.py
==============================================================================
--- python/trunk/Lib/encodings/mac_roman.py (original)
+++ python/trunk/Lib/encodings/mac_roman.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0xFB01: 0xDE, # LATIN SMALL LIGATURE FI
0xFB02: 0xDF, # LATIN SMALL LIGATURE FL
}
-
Modified: python/trunk/Lib/encodings/mac_romanian.py
==============================================================================
--- python/trunk/Lib/encodings/mac_romanian.py (original)
+++ python/trunk/Lib/encodings/mac_romanian.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0x25CA: 0xD7, # LOZENGE
0xF8FF: 0xF0, # Apple logo
}
-
Modified: python/trunk/Lib/encodings/mac_turkish.py
==============================================================================
--- python/trunk/Lib/encodings/mac_turkish.py (original)
+++ python/trunk/Lib/encodings/mac_turkish.py Wed Mar 15 19:08:37 2006
@@ -563,4 +563,3 @@
0xF8A0: 0xF5, # undefined1
0xF8FF: 0xF0, # Apple logo
}
-
Modified: python/trunk/Lib/encodings/tis_620.py
==============================================================================
--- python/trunk/Lib/encodings/tis_620.py (original)
+++ python/trunk/Lib/encodings/tis_620.py Wed Mar 15 19:08:37 2006
@@ -554,4 +554,3 @@
0x0E5A: 0xFA, # THAI CHARACTER ANGKHANKHU
0x0E5B: 0xFB, # THAI CHARACTER KHOMUT
}
-
Modified: python/trunk/Lib/encodings/utf_7.py
==============================================================================
--- python/trunk/Lib/encodings/utf_7.py (original)
+++ python/trunk/Lib/encodings/utf_7.py Wed Mar 15 19:08:37 2006
@@ -38,4 +38,4 @@
incrementaldecoder=IncrementalDecoder,
streamreader=StreamReader,
streamwriter=StreamWriter,
- )
\ No newline at end of file
+ )
Modified: python/trunk/Lib/runpy.py
==============================================================================
--- python/trunk/Lib/runpy.py (original)
+++ python/trunk/Lib/runpy.py Wed Mar 15 19:08:37 2006
@@ -239,7 +239,7 @@
importer = _FileSystemImporter(path_item)
except ImportError:
pass
- return importer
+ return importer
def _get_path_loader(mod_name, path=None):
@@ -283,7 +283,7 @@
If the module or package is accessible via the normal import
mechanism, a wrapper around the relevant part of that machinery
is returned.
-
+
Non PEP 302 mechanisms (e.g. the Windows registry) used by the
standard import machinery to find files in alternative locations
are partially supported, but are searched AFTER sys.path. Normally,
@@ -328,7 +328,7 @@
else:
# Top level module, so stick with default path
sub_name = mod_name
-
+
for importer in sys.meta_path:
loader = importer.find_module(mod_name, path)
if loader is not None:
@@ -406,7 +406,7 @@
def run_module(mod_name, init_globals=None,
run_name=None, alter_sys=False):
"""Execute a module's code without importing it
-
+
Returns the resulting top level namespace dictionary
"""
loader = _get_loader(mod_name)
@@ -418,7 +418,7 @@
filename = _get_filename(loader, mod_name)
if run_name is None:
run_name = mod_name
- return _run_module_code(code, init_globals, run_name,
+ return _run_module_code(code, init_globals, run_name,
filename, loader, alter_sys)
Modified: python/trunk/Lib/test/test_runpy.py
==============================================================================
--- python/trunk/Lib/test/test_runpy.py (original)
+++ python/trunk/Lib/test/test_runpy.py Wed Mar 15 19:08:37 2006
@@ -165,8 +165,8 @@
def test_main():
- run_unittest(RunModuleCodeTest)
- run_unittest(RunModuleTest)
+ run_unittest(RunModuleCodeTest)
+ run_unittest(RunModuleTest)
if __name__ == "__main__":
- test_main()
\ No newline at end of file
+ test_main()
More information about the Python-checkins
mailing list