Commit f99b8162 authored by Tim Peters's avatar Tim Peters

Whitespace normalization.

parent 13ed60b5
...@@ -117,9 +117,9 @@ def search_function(encoding): ...@@ -117,9 +117,9 @@ def search_function(encoding):
entry = getregentry() entry = getregentry()
if not isinstance(entry, codecs.CodecInfo): if not isinstance(entry, codecs.CodecInfo):
if not 4 <= len(entry) <= 7: if not 4 <= len(entry) <= 7:
raise CodecRegistryError,\ raise CodecRegistryError,\
'module "%s" (%s) failed to register' % \ 'module "%s" (%s) failed to register' % \
(mod.__name__, mod.__file__) (mod.__name__, mod.__file__)
if not callable(entry[0]) or \ if not callable(entry[0]) or \
not callable(entry[1]) or \ not callable(entry[1]) or \
(entry[2] is not None and not callable(entry[2])) or \ (entry[2] is not None and not callable(entry[2])) or \
......
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x00FE: 0x8E, # LATIN SMALL LETTER THORN (ICELANDIC) 0x00FE: 0x8E, # LATIN SMALL LETTER THORN (ICELANDIC)
0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS 0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS
} }
...@@ -562,4 +562,3 @@ encoding_map = { ...@@ -562,4 +562,3 @@ encoding_map = {
0xFEF2: 0xFA, # ARABIC LETTER YEH FINAL FORM 0xFEF2: 0xFA, # ARABIC LETTER YEH FINAL FORM
0xFEF3: 0xFB, # ARABIC LETTER YEH INITIAL FORM 0xFEF3: 0xFB, # ARABIC LETTER YEH INITIAL FORM
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x015E: 0x7C, # LATIN CAPITAL LETTER S WITH CEDILLA 0x015E: 0x7C, # LATIN CAPITAL LETTER S WITH CEDILLA
0x015F: 0x6A, # LATIN SMALL LETTER S WITH CEDILLA 0x015F: 0x6A, # LATIN SMALL LETTER S WITH CEDILLA
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS 0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS
0x20AC: 0x9F, # EURO SIGN 0x20AC: 0x9F, # EURO SIGN
} }
...@@ -558,4 +558,3 @@ encoding_map = { ...@@ -558,4 +558,3 @@ encoding_map = {
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -562,4 +562,3 @@ encoding_map = { ...@@ -562,4 +562,3 @@ encoding_map = {
0x2116: 0xB9, # NUMERO SIGN 0x2116: 0xB9, # NUMERO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -558,4 +558,3 @@ encoding_map = { ...@@ -558,4 +558,3 @@ encoding_map = {
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -546,4 +546,3 @@ encoding_map = { ...@@ -546,4 +546,3 @@ encoding_map = {
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -556,4 +556,3 @@ encoding_map = { ...@@ -556,4 +556,3 @@ encoding_map = {
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -540,4 +540,3 @@ encoding_map = { ...@@ -540,4 +540,3 @@ encoding_map = {
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -551,4 +551,3 @@ encoding_map = { ...@@ -551,4 +551,3 @@ encoding_map = {
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -554,4 +554,3 @@ encoding_map = { ...@@ -554,4 +554,3 @@ encoding_map = {
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
0x2122: 0x99, # TRADE MARK SIGN 0x2122: 0x99, # TRADE MARK SIGN
} }
...@@ -525,4 +525,3 @@ encoding_map = { ...@@ -525,4 +525,3 @@ encoding_map = {
0x05EA: 0x71, # HEBREW LETTER TAV 0x05EA: 0x71, # HEBREW LETTER TAV
0x2017: 0x78, # DOUBLE LOW LINE 0x2017: 0x78, # DOUBLE LOW LINE
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x00FE: 0x8E, # LATIN SMALL LETTER THORN (ICELANDIC) 0x00FE: 0x8E, # LATIN SMALL LETTER THORN (ICELANDIC)
0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS 0x00FF: 0xDF, # LATIN SMALL LETTER Y WITH DIAERESIS
} }
...@@ -522,4 +522,3 @@ encoding_map = { ...@@ -522,4 +522,3 @@ encoding_map = {
0x2593: 0xB2, # DARK SHADE 0x2593: 0xB2, # DARK SHADE
0x25A0: 0xFE, # BLACK SQUARE 0x25A0: 0xFE, # BLACK SQUARE
} }
...@@ -532,4 +532,3 @@ encoding_map = { ...@@ -532,4 +532,3 @@ encoding_map = {
0x2026: 0x85, # HORIZONTAL ELLIPSIS 0x2026: 0x85, # HORIZONTAL ELLIPSIS
0x20AC: 0x80, # EURO SIGN 0x20AC: 0x80, # EURO SIGN
} }
...@@ -557,4 +557,3 @@ encoding_map = { ...@@ -557,4 +557,3 @@ encoding_map = {
0x2018: 0xCE, # LEFT SINGLE QUOTATION MARK 0x2018: 0xCE, # LEFT SINGLE QUOTATION MARK
0x2019: 0xDE, # RIGHT SINGLE QUOTATION MARK 0x2019: 0xDE, # RIGHT SINGLE QUOTATION MARK
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x00FE: 0xFE, # LATIN SMALL LETTER THORN (Icelandic) 0x00FE: 0xFE, # LATIN SMALL LETTER THORN (Icelandic)
0x00FF: 0xFF, # LATIN SMALL LETTER Y WITH DIAERESIS 0x00FF: 0xFF, # LATIN SMALL LETTER Y WITH DIAERESIS
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x017E: 0xBC, # LATIN SMALL LETTER Z WITH CARON 0x017E: 0xBC, # LATIN SMALL LETTER Z WITH CARON
0x2015: 0xBD, # HORIZONTAL BAR 0x2015: 0xBD, # HORIZONTAL BAR
} }
...@@ -555,4 +555,3 @@ encoding_map = { ...@@ -555,4 +555,3 @@ encoding_map = {
0x0E5A: 0xFA, # THAI CHARACTER ANGKHANKHU 0x0E5A: 0xFA, # THAI CHARACTER ANGKHANKHU
0x0E5B: 0xFB, # THAI CHARACTER KHOMUT 0x0E5B: 0xFB, # THAI CHARACTER KHOMUT
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x201D: 0xA1, # RIGHT DOUBLE QUOTATION MARK 0x201D: 0xA1, # RIGHT DOUBLE QUOTATION MARK
0x201E: 0xA5, # DOUBLE LOW-9 QUOTATION MARK 0x201E: 0xA5, # DOUBLE LOW-9 QUOTATION MARK
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x1EF2: 0xAC, # LATIN CAPITAL LETTER Y WITH GRAVE 0x1EF2: 0xAC, # LATIN CAPITAL LETTER Y WITH GRAVE
0x1EF3: 0xBC, # LATIN SMALL LETTER Y WITH GRAVE 0x1EF3: 0xBC, # LATIN SMALL LETTER Y WITH GRAVE
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x017E: 0xB8, # LATIN SMALL LETTER Z WITH CARON 0x017E: 0xB8, # LATIN SMALL LETTER Z WITH CARON
0x20AC: 0xA4, # EURO SIGN 0x20AC: 0xA4, # EURO SIGN
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x201E: 0xA5, # DOUBLE LOW-9 QUOTATION MARK 0x201E: 0xA5, # DOUBLE LOW-9 QUOTATION MARK
0x20AC: 0xA4, # EURO SIGN 0x20AC: 0xA4, # EURO SIGN
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x02DB: 0xB2, # OGONEK 0x02DB: 0xB2, # OGONEK
0x02DD: 0xBD, # DOUBLE ACUTE ACCENT 0x02DD: 0xBD, # DOUBLE ACUTE ACCENT
} }
...@@ -556,4 +556,3 @@ encoding_map = { ...@@ -556,4 +556,3 @@ encoding_map = {
0x02D8: 0xA2, # BREVE 0x02D8: 0xA2, # BREVE
0x02D9: 0xFF, # DOT ABOVE 0x02D9: 0xFF, # DOT ABOVE
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x02D9: 0xFF, # DOT ABOVE 0x02D9: 0xFF, # DOT ABOVE
0x02DB: 0xB2, # OGONEK 0x02DB: 0xB2, # OGONEK
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x045F: 0xFF, # CYRILLIC SMALL LETTER DZHE 0x045F: 0xFF, # CYRILLIC SMALL LETTER DZHE
0x2116: 0xF0, # NUMERO SIGN 0x2116: 0xF0, # NUMERO SIGN
} }
...@@ -518,4 +518,3 @@ encoding_map = { ...@@ -518,4 +518,3 @@ encoding_map = {
0x0651: 0xF1, # ARABIC SHADDA 0x0651: 0xF1, # ARABIC SHADDA
0x0652: 0xF2, # ARABIC SUKUN 0x0652: 0xF2, # ARABIC SUKUN
} }
...@@ -560,4 +560,3 @@ encoding_map = { ...@@ -560,4 +560,3 @@ encoding_map = {
0x20AC: 0xA4, # EURO SIGN 0x20AC: 0xA4, # EURO SIGN
0x20AF: 0xA5, # DRACHMA SIGN 0x20AF: 0xA5, # DRACHMA SIGN
} }
...@@ -527,4 +527,3 @@ encoding_map = { ...@@ -527,4 +527,3 @@ encoding_map = {
0x200F: 0xFE, # RIGHT-TO-LEFT MARK 0x200F: 0xFE, # RIGHT-TO-LEFT MARK
0x2017: 0xDF, # DOUBLE LOW LINE 0x2017: 0xDF, # DOUBLE LOW LINE
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x015E: 0xDE, # LATIN CAPITAL LETTER S WITH CEDILLA 0x015E: 0xDE, # LATIN CAPITAL LETTER S WITH CEDILLA
0x015F: 0xFE, # LATIN SMALL LETTER S WITH CEDILLA 0x015F: 0xFE, # LATIN SMALL LETTER S WITH CEDILLA
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x2593: 0x92, # DARK SHADE 0x2593: 0x92, # DARK SHADE
0x25A0: 0x94, # BLACK SQUARE 0x25A0: 0x94, # BLACK SQUARE
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x2593: 0x92, # DARK SHADE 0x2593: 0x92, # DARK SHADE
0x25A0: 0x94, # BLACK SQUARE 0x25A0: 0x94, # BLACK SQUARE
} }
...@@ -48,4 +48,3 @@ def getregentry(): ...@@ -48,4 +48,3 @@ def getregentry():
streamreader=StreamReader, streamreader=StreamReader,
streamwriter=StreamWriter, streamwriter=StreamWriter,
) )
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x2265: 0xB3, # GREATER-THAN OR EQUAL TO 0x2265: 0xB3, # GREATER-THAN OR EQUAL TO
0x25CA: 0xD7, # LOZENGE 0x25CA: 0xD7, # LOZENGE
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x25CA: 0xD7, # LOZENGE 0x25CA: 0xD7, # LOZENGE
0xF8FF: 0xD8, # Apple logo 0xF8FF: 0xD8, # Apple logo
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x2264: 0xB2, # LESS-THAN OR EQUAL TO 0x2264: 0xB2, # LESS-THAN OR EQUAL TO
0x2265: 0xB3, # GREATER-THAN OR EQUAL TO 0x2265: 0xB3, # GREATER-THAN OR EQUAL TO
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x2026: 0x93, # HORIZONTAL ELLIPSIS, right-left 0x2026: 0x93, # HORIZONTAL ELLIPSIS, right-left
0x274A: 0xC0, # EIGHT TEARDROP-SPOKED PROPELLER ASTERISK, right-left 0x274A: 0xC0, # EIGHT TEARDROP-SPOKED PROPELLER ASTERISK, right-left
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x2264: 0xB2, # LESS-THAN OR EQUAL TO 0x2264: 0xB2, # LESS-THAN OR EQUAL TO
0x2265: 0xB3, # GREATER-THAN OR EQUAL TO 0x2265: 0xB3, # GREATER-THAN OR EQUAL TO
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x25CA: 0xD7, # LOZENGE 0x25CA: 0xD7, # LOZENGE
0xF8FF: 0xF0, # Apple logo 0xF8FF: 0xF0, # Apple logo
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0xFB01: 0xDE, # LATIN SMALL LIGATURE FI 0xFB01: 0xDE, # LATIN SMALL LIGATURE FI
0xFB02: 0xDF, # LATIN SMALL LIGATURE FL 0xFB02: 0xDF, # LATIN SMALL LIGATURE FL
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0x25CA: 0xD7, # LOZENGE 0x25CA: 0xD7, # LOZENGE
0xF8FF: 0xF0, # Apple logo 0xF8FF: 0xF0, # Apple logo
} }
...@@ -563,4 +563,3 @@ encoding_map = { ...@@ -563,4 +563,3 @@ encoding_map = {
0xF8A0: 0xF5, # undefined1 0xF8A0: 0xF5, # undefined1
0xF8FF: 0xF0, # Apple logo 0xF8FF: 0xF0, # Apple logo
} }
...@@ -554,4 +554,3 @@ encoding_map = { ...@@ -554,4 +554,3 @@ encoding_map = {
0x0E5A: 0xFA, # THAI CHARACTER ANGKHANKHU 0x0E5A: 0xFA, # THAI CHARACTER ANGKHANKHU
0x0E5B: 0xFB, # THAI CHARACTER KHOMUT 0x0E5B: 0xFB, # THAI CHARACTER KHOMUT
} }
...@@ -38,4 +38,4 @@ def getregentry(): ...@@ -38,4 +38,4 @@ def getregentry():
incrementaldecoder=IncrementalDecoder, incrementaldecoder=IncrementalDecoder,
streamreader=StreamReader, streamreader=StreamReader,
streamwriter=StreamWriter, streamwriter=StreamWriter,
) )
\ No newline at end of file
...@@ -239,7 +239,7 @@ except AttributeError: ...@@ -239,7 +239,7 @@ except AttributeError:
importer = _FileSystemImporter(path_item) importer = _FileSystemImporter(path_item)
except ImportError: except ImportError:
pass pass
return importer return importer
def _get_path_loader(mod_name, path=None): def _get_path_loader(mod_name, path=None):
...@@ -283,7 +283,7 @@ except AttributeError: ...@@ -283,7 +283,7 @@ except AttributeError:
If the module or package is accessible via the normal import If the module or package is accessible via the normal import
mechanism, a wrapper around the relevant part of that machinery mechanism, a wrapper around the relevant part of that machinery
is returned. is returned.
Non PEP 302 mechanisms (e.g. the Windows registry) used by the Non PEP 302 mechanisms (e.g. the Windows registry) used by the
standard import machinery to find files in alternative locations standard import machinery to find files in alternative locations
are partially supported, but are searched AFTER sys.path. Normally, are partially supported, but are searched AFTER sys.path. Normally,
...@@ -328,7 +328,7 @@ except AttributeError: ...@@ -328,7 +328,7 @@ except AttributeError:
else: else:
# Top level module, so stick with default path # Top level module, so stick with default path
sub_name = mod_name sub_name = mod_name
for importer in sys.meta_path: for importer in sys.meta_path:
loader = importer.find_module(mod_name, path) loader = importer.find_module(mod_name, path)
if loader is not None: if loader is not None:
...@@ -406,7 +406,7 @@ def _run_module_code(code, init_globals=None, ...@@ -406,7 +406,7 @@ def _run_module_code(code, init_globals=None,
def run_module(mod_name, init_globals=None, def run_module(mod_name, init_globals=None,
run_name=None, alter_sys=False): run_name=None, alter_sys=False):
"""Execute a module's code without importing it """Execute a module's code without importing it
Returns the resulting top level namespace dictionary Returns the resulting top level namespace dictionary
""" """
loader = _get_loader(mod_name) loader = _get_loader(mod_name)
...@@ -418,7 +418,7 @@ def run_module(mod_name, init_globals=None, ...@@ -418,7 +418,7 @@ def run_module(mod_name, init_globals=None,
filename = _get_filename(loader, mod_name) filename = _get_filename(loader, mod_name)
if run_name is None: if run_name is None:
run_name = mod_name 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) filename, loader, alter_sys)
......
...@@ -165,8 +165,8 @@ class RunModuleTest(unittest.TestCase): ...@@ -165,8 +165,8 @@ class RunModuleTest(unittest.TestCase):
def test_main(): def test_main():
run_unittest(RunModuleCodeTest) run_unittest(RunModuleCodeTest)
run_unittest(RunModuleTest) run_unittest(RunModuleTest)
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment