diff options
| author | Tim Peters <tim.peters@gmail.com> | 2004-07-07 20:54:48 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2004-07-07 20:54:48 (GMT) |
| commit | 4e0e1b6a540e664e89739456db4c706701bf062b (patch) | |
| tree | 6a144e54fe6f0055d6e412181df0bbad458f8b10 | |
| parent | b7e898a0e2a8d4077cbabeada039200fde5ada60 (diff) | |
| download | cpython-4e0e1b6a540e664e89739456db4c706701bf062b.zip cpython-4e0e1b6a540e664e89739456db4c706701bf062b.tar.gz cpython-4e0e1b6a540e664e89739456db4c706701bf062b.tar.bz2 | |
Whitespace normalization.
32 files changed, 144 insertions, 166 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 7a790d3..8d8d88f 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -304,7 +304,7 @@ class dispatcher: if why[0] == EWOULDBLOCK: pass else: - raise + raise def send(self, data): try: @@ -314,7 +314,7 @@ class dispatcher: if why[0] == EWOULDBLOCK: return 0 else: - raise + raise return 0 def recv(self, buffer_size): @@ -333,7 +333,7 @@ class dispatcher: self.handle_close() return '' else: - raise + raise def close(self): self.del_channel() @@ -529,4 +529,3 @@ if os.name == 'posix': self._fileno = fd self.socket = file_wrapper(fd) self.add_channel() - @@ -149,7 +149,7 @@ class Cmd: readline.set_completer(self.old_completer) except ImportError: pass - + def precmd(self, line): """Hook method executed just before the command line is @@ -172,7 +172,7 @@ class Cmd: """ pass - + def parseline(self, line): """Parse the line into a command name and a string containing the arguments. Returns a tuple containing (command, args, line). diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py index ef5a0d3..4d5f728 100644 --- a/Lib/compiler/pycodegen.py +++ b/Lib/compiler/pycodegen.py @@ -671,7 +671,7 @@ class CodeGenerator: def visitGenExprFor(self, node): start = self.newBlock() anchor = self.newBlock() - + if node.is_outmost: self.loadName('[outmost-iterable]') else: diff --git a/Lib/compiler/symbols.py b/Lib/compiler/symbols.py index 6843e19..e1581a4 100644 --- a/Lib/compiler/symbols.py +++ b/Lib/compiler/symbols.py @@ -260,13 +260,13 @@ class SymbolVisitor: def visitGenExprIf(self, node, scope): self.visit(node.test, scope) - + def visitLambda(self, node, parent, assign=0): # Lambda is an expression, so it could appear in an expression # context where assign is passed. The transformer should catch # any code that has a lambda on the left-hand side. - assert not assign - + assert not assign + for n in node.defaults: self.visit(n, parent) scope = LambdaScope(self.module, self.klass) diff --git a/Lib/decimal.py b/Lib/decimal.py index 1d13767..93a5e34 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -509,10 +509,10 @@ class Decimal(object): return if isinstance(value, Decimal): - self._exp = value._exp - self._sign = value._sign - self._int = value._int - return + self._exp = value._exp + self._sign = value._sign + self._int = value._int + return raise TypeError("Can't convert %r" % value) @@ -2817,7 +2817,7 @@ class _WorkRep(object): carry = 1 selfint[x] += 10 else: - carry = 0 + carry = 0 if carry: selfint[x+1] -= 1 last = len(selfint)-1 diff --git a/Lib/doctest.py b/Lib/doctest.py index acde9c1..611897d 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -205,7 +205,7 @@ Bummers: docstring, which will preserve your backslahses exactly as you type them: - >>> def f(x): + >>> def f(x): ... r'''Backslashes in a raw docstring: m\n''' >>> print f.__doc__ Backslashes in a raw docstring: m\n @@ -215,11 +215,11 @@ Bummers: Alternatively, you can double each backslash in the doctest version (and not use a raw string): - >>> def f(x): + >>> def f(x): ... '''Backslashes in a raw docstring: m\\n''' >>> print f.__doc__ Backslashes in a raw docstring: m\n - + The starting column doesn't matter: >>> assert "Easy!" diff --git a/Lib/encodings/big5.py b/Lib/encodings/big5.py index 2346274..0f855f8 100644 --- a/Lib/encodings/big5.py +++ b/Lib/encodings/big5.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/cp932.py b/Lib/encodings/cp932.py index 4bd8894..028832d 100644 --- a/Lib/encodings/cp932.py +++ b/Lib/encodings/cp932.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/cp949.py b/Lib/encodings/cp949.py index 0a0b009..c499d20 100644 --- a/Lib/encodings/cp949.py +++ b/Lib/encodings/cp949.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/cp950.py b/Lib/encodings/cp950.py index a3b6c0e..104651d 100644 --- a/Lib/encodings/cp950.py +++ b/Lib/encodings/cp950.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/euc_jisx0213.py b/Lib/encodings/euc_jisx0213.py index d54e864..9da6b99 100644 --- a/Lib/encodings/euc_jisx0213.py +++ b/Lib/encodings/euc_jisx0213.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/euc_jp.py b/Lib/encodings/euc_jp.py index ff3b155..77fe2b6 100644 --- a/Lib/encodings/euc_jp.py +++ b/Lib/encodings/euc_jp.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/euc_kr.py b/Lib/encodings/euc_kr.py index 7ad237e..9ef155e 100644 --- a/Lib/encodings/euc_kr.py +++ b/Lib/encodings/euc_kr.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/gb18030.py b/Lib/encodings/gb18030.py index 921ab50..f628af3 100644 --- a/Lib/encodings/gb18030.py +++ b/Lib/encodings/gb18030.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/gb2312.py b/Lib/encodings/gb2312.py index 8f8bfd1..7ced701 100644 --- a/Lib/encodings/gb2312.py +++ b/Lib/encodings/gb2312.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/gbk.py b/Lib/encodings/gbk.py index 557058d..f5e32e5 100644 --- a/Lib/encodings/gbk.py +++ b/Lib/encodings/gbk.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/hz.py b/Lib/encodings/hz.py index 0e87a56..0278ce5 100644 --- a/Lib/encodings/hz.py +++ b/Lib/encodings/hz.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/iso2022_jp.py b/Lib/encodings/iso2022_jp.py index c3f3150..a23a13a 100644 --- a/Lib/encodings/iso2022_jp.py +++ b/Lib/encodings/iso2022_jp.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/iso2022_jp_1.py b/Lib/encodings/iso2022_jp_1.py index 292cc9c..6050e5f 100644 --- a/Lib/encodings/iso2022_jp_1.py +++ b/Lib/encodings/iso2022_jp_1.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/iso2022_jp_2.py b/Lib/encodings/iso2022_jp_2.py index 8fb0aba..6171710 100644 --- a/Lib/encodings/iso2022_jp_2.py +++ b/Lib/encodings/iso2022_jp_2.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/iso2022_jp_3.py b/Lib/encodings/iso2022_jp_3.py index 49bde5e..144f83e 100644 --- a/Lib/encodings/iso2022_jp_3.py +++ b/Lib/encodings/iso2022_jp_3.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/iso2022_jp_ext.py b/Lib/encodings/iso2022_jp_ext.py index 9ac10ce..7adf758 100644 --- a/Lib/encodings/iso2022_jp_ext.py +++ b/Lib/encodings/iso2022_jp_ext.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/iso2022_kr.py b/Lib/encodings/iso2022_kr.py index 76cb92e..ead7ff5 100644 --- a/Lib/encodings/iso2022_kr.py +++ b/Lib/encodings/iso2022_kr.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/johab.py b/Lib/encodings/johab.py index f969d58..720195e 100644 --- a/Lib/encodings/johab.py +++ b/Lib/encodings/johab.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/ptcp154.py b/Lib/encodings/ptcp154.py index 7734f61..5cdd98c 100644 --- a/Lib/encodings/ptcp154.py +++ b/Lib/encodings/ptcp154.py @@ -37,124 +37,124 @@ def getregentry(): decoding_map = codecs.make_identity_dict(range(256)) decoding_map.update({ - 0x0080: 0x0496, # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER - 0x0081: 0x0492, # CYRILLIC CAPITAL LETTER GHE WITH STROKE - 0x0082: 0x04ee, # CYRILLIC CAPITAL LETTER U WITH MACRON - 0x0083: 0x0493, # CYRILLIC SMALL LETTER GHE WITH STROKE - 0x0084: 0x201e, # DOUBLE LOW-9 QUOTATION MARK - 0x0085: 0x2026, # HORIZONTAL ELLIPSIS - 0x0086: 0x04b6, # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER - 0x0087: 0x04ae, # CYRILLIC CAPITAL LETTER STRAIGHT U - 0x0088: 0x04b2, # CYRILLIC CAPITAL LETTER HA WITH DESCENDER - 0x0089: 0x04af, # CYRILLIC SMALL LETTER STRAIGHT U - 0x008a: 0x04a0, # CYRILLIC CAPITAL LETTER BASHKIR KA - 0x008b: 0x04e2, # CYRILLIC CAPITAL LETTER I WITH MACRON - 0x008c: 0x04a2, # CYRILLIC CAPITAL LETTER EN WITH DESCENDER - 0x008d: 0x049a, # CYRILLIC CAPITAL LETTER KA WITH DESCENDER - 0x008e: 0x04ba, # CYRILLIC CAPITAL LETTER SHHA - 0x008f: 0x04b8, # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE - 0x0090: 0x0497, # CYRILLIC SMALL LETTER ZHE WITH DESCENDER - 0x0091: 0x2018, # LEFT SINGLE QUOTATION MARK - 0x0092: 0x2019, # RIGHT SINGLE QUOTATION MARK - 0x0093: 0x201c, # LEFT DOUBLE QUOTATION MARK - 0x0094: 0x201d, # RIGHT DOUBLE QUOTATION MARK - 0x0095: 0x2022, # BULLET - 0x0096: 0x2013, # EN DASH - 0x0097: 0x2014, # EM DASH - 0x0098: 0x04b3, # CYRILLIC SMALL LETTER HA WITH DESCENDER - 0x0099: 0x04b7, # CYRILLIC SMALL LETTER CHE WITH DESCENDER - 0x009a: 0x04a1, # CYRILLIC SMALL LETTER BASHKIR KA - 0x009b: 0x04e3, # CYRILLIC SMALL LETTER I WITH MACRON - 0x009c: 0x04a3, # CYRILLIC SMALL LETTER EN WITH DESCENDER - 0x009d: 0x049b, # CYRILLIC SMALL LETTER KA WITH DESCENDER - 0x009e: 0x04bb, # CYRILLIC SMALL LETTER SHHA - 0x009f: 0x04b9, # CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE - 0x00a1: 0x040e, # CYRILLIC CAPITAL LETTER SHORT U (Byelorussian) - 0x00a2: 0x045e, # CYRILLIC SMALL LETTER SHORT U (Byelorussian) - 0x00a3: 0x0408, # CYRILLIC CAPITAL LETTER JE - 0x00a4: 0x04e8, # CYRILLIC CAPITAL LETTER BARRED O - 0x00a5: 0x0498, # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER - 0x00a6: 0x04b0, # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE - 0x00a8: 0x0401, # CYRILLIC CAPITAL LETTER IO - 0x00aa: 0x04d8, # CYRILLIC CAPITAL LETTER SCHWA - 0x00ad: 0x04ef, # CYRILLIC SMALL LETTER U WITH MACRON - 0x00af: 0x049c, # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE - 0x00b1: 0x04b1, # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE - 0x00b2: 0x0406, # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I - 0x00b3: 0x0456, # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I - 0x00b4: 0x0499, # CYRILLIC SMALL LETTER ZE WITH DESCENDER - 0x00b5: 0x04e9, # CYRILLIC SMALL LETTER BARRED O - 0x00b8: 0x0451, # CYRILLIC SMALL LETTER IO - 0x00b9: 0x2116, # NUMERO SIGN - 0x00ba: 0x04d9, # CYRILLIC SMALL LETTER SCHWA - 0x00bc: 0x0458, # CYRILLIC SMALL LETTER JE - 0x00bd: 0x04aa, # CYRILLIC CAPITAL LETTER ES WITH DESCENDER - 0x00be: 0x04ab, # CYRILLIC SMALL LETTER ES WITH DESCENDER - 0x00bf: 0x049d, # CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE - 0x00c0: 0x0410, # CYRILLIC CAPITAL LETTER A - 0x00c1: 0x0411, # CYRILLIC CAPITAL LETTER BE - 0x00c2: 0x0412, # CYRILLIC CAPITAL LETTER VE - 0x00c3: 0x0413, # CYRILLIC CAPITAL LETTER GHE - 0x00c4: 0x0414, # CYRILLIC CAPITAL LETTER DE - 0x00c5: 0x0415, # CYRILLIC CAPITAL LETTER IE - 0x00c6: 0x0416, # CYRILLIC CAPITAL LETTER ZHE - 0x00c7: 0x0417, # CYRILLIC CAPITAL LETTER ZE - 0x00c8: 0x0418, # CYRILLIC CAPITAL LETTER I - 0x00c9: 0x0419, # CYRILLIC CAPITAL LETTER SHORT I - 0x00ca: 0x041a, # CYRILLIC CAPITAL LETTER KA - 0x00cb: 0x041b, # CYRILLIC CAPITAL LETTER EL - 0x00cc: 0x041c, # CYRILLIC CAPITAL LETTER EM - 0x00cd: 0x041d, # CYRILLIC CAPITAL LETTER EN - 0x00ce: 0x041e, # CYRILLIC CAPITAL LETTER O - 0x00cf: 0x041f, # CYRILLIC CAPITAL LETTER PE - 0x00d0: 0x0420, # CYRILLIC CAPITAL LETTER ER - 0x00d1: 0x0421, # CYRILLIC CAPITAL LETTER ES - 0x00d2: 0x0422, # CYRILLIC CAPITAL LETTER TE - 0x00d3: 0x0423, # CYRILLIC CAPITAL LETTER U - 0x00d4: 0x0424, # CYRILLIC CAPITAL LETTER EF - 0x00d5: 0x0425, # CYRILLIC CAPITAL LETTER HA - 0x00d6: 0x0426, # CYRILLIC CAPITAL LETTER TSE - 0x00d7: 0x0427, # CYRILLIC CAPITAL LETTER CHE - 0x00d8: 0x0428, # CYRILLIC CAPITAL LETTER SHA - 0x00d9: 0x0429, # CYRILLIC CAPITAL LETTER SHCHA - 0x00da: 0x042a, # CYRILLIC CAPITAL LETTER HARD SIGN - 0x00db: 0x042b, # CYRILLIC CAPITAL LETTER YERU - 0x00dc: 0x042c, # CYRILLIC CAPITAL LETTER SOFT SIGN - 0x00dd: 0x042d, # CYRILLIC CAPITAL LETTER E - 0x00de: 0x042e, # CYRILLIC CAPITAL LETTER YU - 0x00df: 0x042f, # CYRILLIC CAPITAL LETTER YA - 0x00e0: 0x0430, # CYRILLIC SMALL LETTER A - 0x00e1: 0x0431, # CYRILLIC SMALL LETTER BE - 0x00e2: 0x0432, # CYRILLIC SMALL LETTER VE - 0x00e3: 0x0433, # CYRILLIC SMALL LETTER GHE - 0x00e4: 0x0434, # CYRILLIC SMALL LETTER DE - 0x00e5: 0x0435, # CYRILLIC SMALL LETTER IE - 0x00e6: 0x0436, # CYRILLIC SMALL LETTER ZHE - 0x00e7: 0x0437, # CYRILLIC SMALL LETTER ZE - 0x00e8: 0x0438, # CYRILLIC SMALL LETTER I - 0x00e9: 0x0439, # CYRILLIC SMALL LETTER SHORT I - 0x00ea: 0x043a, # CYRILLIC SMALL LETTER KA - 0x00eb: 0x043b, # CYRILLIC SMALL LETTER EL - 0x00ec: 0x043c, # CYRILLIC SMALL LETTER EM - 0x00ed: 0x043d, # CYRILLIC SMALL LETTER EN - 0x00ee: 0x043e, # CYRILLIC SMALL LETTER O - 0x00ef: 0x043f, # CYRILLIC SMALL LETTER PE - 0x00f0: 0x0440, # CYRILLIC SMALL LETTER ER - 0x00f1: 0x0441, # CYRILLIC SMALL LETTER ES - 0x00f2: 0x0442, # CYRILLIC SMALL LETTER TE - 0x00f3: 0x0443, # CYRILLIC SMALL LETTER U - 0x00f4: 0x0444, # CYRILLIC SMALL LETTER EF - 0x00f5: 0x0445, # CYRILLIC SMALL LETTER HA - 0x00f6: 0x0446, # CYRILLIC SMALL LETTER TSE - 0x00f7: 0x0447, # CYRILLIC SMALL LETTER CHE - 0x00f8: 0x0448, # CYRILLIC SMALL LETTER SHA - 0x00f9: 0x0449, # CYRILLIC SMALL LETTER SHCHA - 0x00fa: 0x044a, # CYRILLIC SMALL LETTER HARD SIGN - 0x00fb: 0x044b, # CYRILLIC SMALL LETTER YERU - 0x00fc: 0x044c, # CYRILLIC SMALL LETTER SOFT SIGN - 0x00fd: 0x044d, # CYRILLIC SMALL LETTER E - 0x00fe: 0x044e, # CYRILLIC SMALL LETTER YU - 0x00ff: 0x044f, # CYRILLIC SMALL LETTER YA + 0x0080: 0x0496, # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER + 0x0081: 0x0492, # CYRILLIC CAPITAL LETTER GHE WITH STROKE + 0x0082: 0x04ee, # CYRILLIC CAPITAL LETTER U WITH MACRON + 0x0083: 0x0493, # CYRILLIC SMALL LETTER GHE WITH STROKE + 0x0084: 0x201e, # DOUBLE LOW-9 QUOTATION MARK + 0x0085: 0x2026, # HORIZONTAL ELLIPSIS + 0x0086: 0x04b6, # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER + 0x0087: 0x04ae, # CYRILLIC CAPITAL LETTER STRAIGHT U + 0x0088: 0x04b2, # CYRILLIC CAPITAL LETTER HA WITH DESCENDER + 0x0089: 0x04af, # CYRILLIC SMALL LETTER STRAIGHT U + 0x008a: 0x04a0, # CYRILLIC CAPITAL LETTER BASHKIR KA + 0x008b: 0x04e2, # CYRILLIC CAPITAL LETTER I WITH MACRON + 0x008c: 0x04a2, # CYRILLIC CAPITAL LETTER EN WITH DESCENDER + 0x008d: 0x049a, # CYRILLIC CAPITAL LETTER KA WITH DESCENDER + 0x008e: 0x04ba, # CYRILLIC CAPITAL LETTER SHHA + 0x008f: 0x04b8, # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE + 0x0090: 0x0497, # CYRILLIC SMALL LETTER ZHE WITH DESCENDER + 0x0091: 0x2018, # LEFT SINGLE QUOTATION MARK + 0x0092: 0x2019, # RIGHT SINGLE QUOTATION MARK + 0x0093: 0x201c, # LEFT DOUBLE QUOTATION MARK + 0x0094: 0x201d, # RIGHT DOUBLE QUOTATION MARK + 0x0095: 0x2022, # BULLET + 0x0096: 0x2013, # EN DASH + 0x0097: 0x2014, # EM DASH + 0x0098: 0x04b3, # CYRILLIC SMALL LETTER HA WITH DESCENDER + 0x0099: 0x04b7, # CYRILLIC SMALL LETTER CHE WITH DESCENDER + 0x009a: 0x04a1, # CYRILLIC SMALL LETTER BASHKIR KA + 0x009b: 0x04e3, # CYRILLIC SMALL LETTER I WITH MACRON + 0x009c: 0x04a3, # CYRILLIC SMALL LETTER EN WITH DESCENDER + 0x009d: 0x049b, # CYRILLIC SMALL LETTER KA WITH DESCENDER + 0x009e: 0x04bb, # CYRILLIC SMALL LETTER SHHA + 0x009f: 0x04b9, # CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE + 0x00a1: 0x040e, # CYRILLIC CAPITAL LETTER SHORT U (Byelorussian) + 0x00a2: 0x045e, # CYRILLIC SMALL LETTER SHORT U (Byelorussian) + 0x00a3: 0x0408, # CYRILLIC CAPITAL LETTER JE + 0x00a4: 0x04e8, # CYRILLIC CAPITAL LETTER BARRED O + 0x00a5: 0x0498, # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER + 0x00a6: 0x04b0, # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE + 0x00a8: 0x0401, # CYRILLIC CAPITAL LETTER IO + 0x00aa: 0x04d8, # CYRILLIC CAPITAL LETTER SCHWA + 0x00ad: 0x04ef, # CYRILLIC SMALL LETTER U WITH MACRON + 0x00af: 0x049c, # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE + 0x00b1: 0x04b1, # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE + 0x00b2: 0x0406, # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I + 0x00b3: 0x0456, # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I + 0x00b4: 0x0499, # CYRILLIC SMALL LETTER ZE WITH DESCENDER + 0x00b5: 0x04e9, # CYRILLIC SMALL LETTER BARRED O + 0x00b8: 0x0451, # CYRILLIC SMALL LETTER IO + 0x00b9: 0x2116, # NUMERO SIGN + 0x00ba: 0x04d9, # CYRILLIC SMALL LETTER SCHWA + 0x00bc: 0x0458, # CYRILLIC SMALL LETTER JE + 0x00bd: 0x04aa, # CYRILLIC CAPITAL LETTER ES WITH DESCENDER + 0x00be: 0x04ab, # CYRILLIC SMALL LETTER ES WITH DESCENDER + 0x00bf: 0x049d, # CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE + 0x00c0: 0x0410, # CYRILLIC CAPITAL LETTER A + 0x00c1: 0x0411, # CYRILLIC CAPITAL LETTER BE + 0x00c2: 0x0412, # CYRILLIC CAPITAL LETTER VE + 0x00c3: 0x0413, # CYRILLIC CAPITAL LETTER GHE + 0x00c4: 0x0414, # CYRILLIC CAPITAL LETTER DE + 0x00c5: 0x0415, # CYRILLIC CAPITAL LETTER IE + 0x00c6: 0x0416, # CYRILLIC CAPITAL LETTER ZHE + 0x00c7: 0x0417, # CYRILLIC CAPITAL LETTER ZE + 0x00c8: 0x0418, # CYRILLIC CAPITAL LETTER I + 0x00c9: 0x0419, # CYRILLIC CAPITAL LETTER SHORT I + 0x00ca: 0x041a, # CYRILLIC CAPITAL LETTER KA + 0x00cb: 0x041b, # CYRILLIC CAPITAL LETTER EL + 0x00cc: 0x041c, # CYRILLIC CAPITAL LETTER EM + 0x00cd: 0x041d, # CYRILLIC CAPITAL LETTER EN + 0x00ce: 0x041e, # CYRILLIC CAPITAL LETTER O + 0x00cf: 0x041f, # CYRILLIC CAPITAL LETTER PE + 0x00d0: 0x0420, # CYRILLIC CAPITAL LETTER ER + 0x00d1: 0x0421, # CYRILLIC CAPITAL LETTER ES + 0x00d2: 0x0422, # CYRILLIC CAPITAL LETTER TE + 0x00d3: 0x0423, # CYRILLIC CAPITAL LETTER U + 0x00d4: 0x0424, # CYRILLIC CAPITAL LETTER EF + 0x00d5: 0x0425, # CYRILLIC CAPITAL LETTER HA + 0x00d6: 0x0426, # CYRILLIC CAPITAL LETTER TSE + 0x00d7: 0x0427, # CYRILLIC CAPITAL LETTER CHE + 0x00d8: 0x0428, # CYRILLIC CAPITAL LETTER SHA + 0x00d9: 0x0429, # CYRILLIC CAPITAL LETTER SHCHA + 0x00da: 0x042a, # CYRILLIC CAPITAL LETTER HARD SIGN + 0x00db: 0x042b, # CYRILLIC CAPITAL LETTER YERU + 0x00dc: 0x042c, # CYRILLIC CAPITAL LETTER SOFT SIGN + 0x00dd: 0x042d, # CYRILLIC CAPITAL LETTER E + 0x00de: 0x042e, # CYRILLIC CAPITAL LETTER YU + 0x00df: 0x042f, # CYRILLIC CAPITAL LETTER YA + 0x00e0: 0x0430, # CYRILLIC SMALL LETTER A + 0x00e1: 0x0431, # CYRILLIC SMALL LETTER BE + 0x00e2: 0x0432, # CYRILLIC SMALL LETTER VE + 0x00e3: 0x0433, # CYRILLIC SMALL LETTER GHE + 0x00e4: 0x0434, # CYRILLIC SMALL LETTER DE + 0x00e5: 0x0435, # CYRILLIC SMALL LETTER IE + 0x00e6: 0x0436, # CYRILLIC SMALL LETTER ZHE + 0x00e7: 0x0437, # CYRILLIC SMALL LETTER ZE + 0x00e8: 0x0438, # CYRILLIC SMALL LETTER I + 0x00e9: 0x0439, # CYRILLIC SMALL LETTER SHORT I + 0x00ea: 0x043a, # CYRILLIC SMALL LETTER KA + 0x00eb: 0x043b, # CYRILLIC SMALL LETTER EL + 0x00ec: 0x043c, # CYRILLIC SMALL LETTER EM + 0x00ed: 0x043d, # CYRILLIC SMALL LETTER EN + 0x00ee: 0x043e, # CYRILLIC SMALL LETTER O + 0x00ef: 0x043f, # CYRILLIC SMALL LETTER PE + 0x00f0: 0x0440, # CYRILLIC SMALL LETTER ER + 0x00f1: 0x0441, # CYRILLIC SMALL LETTER ES + 0x00f2: 0x0442, # CYRILLIC SMALL LETTER TE + 0x00f3: 0x0443, # CYRILLIC SMALL LETTER U + 0x00f4: 0x0444, # CYRILLIC SMALL LETTER EF + 0x00f5: 0x0445, # CYRILLIC SMALL LETTER HA + 0x00f6: 0x0446, # CYRILLIC SMALL LETTER TSE + 0x00f7: 0x0447, # CYRILLIC SMALL LETTER CHE + 0x00f8: 0x0448, # CYRILLIC SMALL LETTER SHA + 0x00f9: 0x0449, # CYRILLIC SMALL LETTER SHCHA + 0x00fa: 0x044a, # CYRILLIC SMALL LETTER HARD SIGN + 0x00fb: 0x044b, # CYRILLIC SMALL LETTER YERU + 0x00fc: 0x044c, # CYRILLIC SMALL LETTER SOFT SIGN + 0x00fd: 0x044d, # CYRILLIC SMALL LETTER E + 0x00fe: 0x044e, # CYRILLIC SMALL LETTER YU + 0x00ff: 0x044f, # CYRILLIC SMALL LETTER YA }) ### Encoding Map diff --git a/Lib/encodings/shift_jis.py b/Lib/encodings/shift_jis.py index 3ee23ea..d235c1e 100644 --- a/Lib/encodings/shift_jis.py +++ b/Lib/encodings/shift_jis.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/encodings/shift_jisx0213.py b/Lib/encodings/shift_jisx0213.py index a32e855..8759c8c 100644 --- a/Lib/encodings/shift_jisx0213.py +++ b/Lib/encodings/shift_jisx0213.py @@ -31,4 +31,3 @@ class StreamWriter(Codec, codecs.StreamWriter): def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) - diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index f4c552d..cf4d782 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1162,7 +1162,7 @@ def basicConfig(**kwargs): root.addHandler(hdlr) level = kwargs.get("level") if level: - root.setLevel(level) + root.setLevel(level) #--------------------------------------------------------------------------- # Utility functions at module level. diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 97632ea..d1e0a91 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -315,9 +315,9 @@ class SocketHandler(logging.Handler): # is the first time back after a disconnect, or # we've waited long enough. if self.retryTime is None: - attempt = 1 + attempt = 1 else: - attempt = (now >= self.retryTime) + attempt = (now >= self.retryTime) if attempt: try: self.sock = self.makeSocket() @@ -366,11 +366,11 @@ class SocketHandler(logging.Handler): """ ei = record.exc_info if ei: - dummy = self.format(record) # just to get traceback text into record.exc_text - record.exc_info = None # to avoid Unpickleable error + dummy = self.format(record) # just to get traceback text into record.exc_text + record.exc_info = None # to avoid Unpickleable error s = cPickle.dumps(record.__dict__, 1) if ei: - record.exc_info = ei # for next handler + record.exc_info = ei # for next handler slen = struct.pack(">L", len(s)) return slen + s diff --git a/Lib/profile.py b/Lib/profile.py index 99a5b62..6ed396e 100755 --- a/Lib/profile.py +++ b/Lib/profile.py @@ -598,14 +598,14 @@ if __name__ == '__main__': parser = ProfileParser(usage) parser.allow_interspersed_args = False - parser.add_option('-o', '--outfile', dest="outfile", + parser.add_option('-o', '--outfile', dest="outfile", help="Save stats to <outfile>", default=None) parser.add_option('-s', '--sort', dest="sort", help="Sort order when printing to stdout, based on pstats.Stats class", default=-1) (options, args) = parser.parse_args() sys.argv[:] = args - + if (len(sys.argv) > 0): sys.path.insert(0, os.path.dirname(sys.argv[0])) run('execfile(%r)' % (sys.argv[0],), options.outfile, options.sort) diff --git a/Lib/site.py b/Lib/site.py index 348938b..a5fce06 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -210,7 +210,7 @@ def setBEGINLIBPATH(): The library search path needs to be amended so these will be found during module import. Use BEGINLIBPATH so that these are at the start of the library search path. - + """ dllpath = os.path.join(sys.prefix, "Lib", "lib-dynload") libpath = os.environ['BEGINLIBPATH'].split(';') diff --git a/Lib/stringprep.py b/Lib/stringprep.py index bb4b565..f997a67 100644 --- a/Lib/stringprep.py +++ b/Lib/stringprep.py @@ -270,4 +270,3 @@ def in_table_d1(code): def in_table_d2(code): return unicodedata.bidirectional(code) == "L" - |