77
88""" #"
99
10- import struct ,types ,__builtin__
10+ import struct , types , __builtin__
1111
1212### Registry and builtin stateless codec functions
1313
1414try :
1515 from _codecs import *
16- except ImportError ,why :
16+ except ImportError , why :
1717 raise SystemError ,\
1818 'Failed to load the builtin codecs: %s' % why
1919
20- __all__ = ["register" ,"lookup" ,"open" ,"EncodedFile" ,"BOM" ,"BOM_BE" ,
21- "BOM_LE" ,"BOM32_BE" ,"BOM32_LE" ,"BOM64_BE" ,"BOM64_LE" ]
20+ __all__ = ["register" , "lookup" , "open" , "EncodedFile" , "BOM" , "BOM_BE" ,
21+ "BOM_LE" , "BOM32_BE" , "BOM32_LE" , "BOM64_BE" , "BOM64_LE" ]
2222
2323### Constants
2424
2525#
2626# Byte Order Mark (BOM) and its possible values (BOM_BE, BOM_LE)
2727#
28- BOM = struct .pack ('=H' ,0xFEFF )
28+ BOM = struct .pack ('=H' , 0xFEFF )
2929#
3030BOM_BE = BOM32_BE = '\376 \377 '
3131# corresponds to Unicode U+FEFF in UTF-16 on big endian
@@ -60,7 +60,7 @@ class Codec:
6060 CHARACTER for the builtin Unicode codecs.
6161
6262 """
63- def encode (self ,input ,errors = 'strict' ):
63+ def encode (self , input , errors = 'strict' ):
6464
6565 """ Encodes the object input and returns a tuple (output
6666 object, length consumed).
@@ -79,7 +79,7 @@ def encode(self,input,errors='strict'):
7979 """
8080 raise NotImplementedError
8181
82- def decode (self ,input ,errors = 'strict' ):
82+ def decode (self , input , errors = 'strict' ):
8383
8484 """ Decodes the object input and returns a tuple (output
8585 object, length consumed).
@@ -111,7 +111,7 @@ def decode(self,input,errors='strict'):
111111
112112class StreamWriter (Codec ):
113113
114- def __init__ (self ,stream ,errors = 'strict' ):
114+ def __init__ (self , stream , errors = 'strict' ):
115115
116116 """ Creates a StreamWriter instance.
117117
@@ -134,7 +134,7 @@ def write(self, object):
134134
135135 """ Writes the object's contents encoded to self.stream.
136136 """
137- data , consumed = self .encode (object ,self .errors )
137+ data , consumed = self .encode (object , self .errors )
138138 self .stream .write (data )
139139
140140 def writelines (self , list ):
@@ -156,19 +156,18 @@ def reset(self):
156156 """
157157 pass
158158
159- def __getattr__ (self ,name ,
160-
159+ def __getattr__ (self , name ,
161160 getattr = getattr ):
162161
163162 """ Inherit all other methods from the underlying stream.
164163 """
165- return getattr (self .stream ,name )
164+ return getattr (self .stream , name )
166165
167166###
168167
169168class StreamReader (Codec ):
170169
171- def __init__ (self ,stream ,errors = 'strict' ):
170+ def __init__ (self , stream , errors = 'strict' ):
172171
173172 """ Creates a StreamReader instance.
174173
@@ -218,7 +217,7 @@ def read(self, size=-1):
218217 while 1 :
219218 try :
220219 object , decodedbytes = decode (data , self .errors )
221- except ValueError ,why :
220+ except ValueError , why :
222221 # This method is slow but should work under pretty much
223222 # all conditions; at most 10 tries are made
224223 i = i + 1
@@ -250,7 +249,7 @@ def readline(self, size=None):
250249 line = self .stream .readline ()
251250 else :
252251 line = self .stream .readline (size )
253- return self .decode (line ,self .errors )[0 ]
252+ return self .decode (line , self .errors )[0 ]
254253
255254
256255 def readlines (self , sizehint = 0 ):
@@ -269,7 +268,7 @@ def readlines(self, sizehint=0):
269268 data = self .stream .read ()
270269 else :
271270 data = self .stream .read (sizehint )
272- return self .decode (data ,self .errors )[0 ].splitlines (1 )
271+ return self .decode (data , self .errors )[0 ].splitlines (1 )
273272
274273 def reset (self ):
275274
@@ -282,13 +281,12 @@ def reset(self):
282281 """
283282 pass
284283
285- def __getattr__ (self ,name ,
286-
284+ def __getattr__ (self , name ,
287285 getattr = getattr ):
288286
289287 """ Inherit all other methods from the underlying stream.
290288 """
291- return getattr (self .stream ,name )
289+ return getattr (self .stream , name )
292290
293291###
294292
@@ -305,7 +303,7 @@ class StreamReaderWriter:
305303 # Optional attributes set by the file wrappers below
306304 encoding = 'unknown'
307305
308- def __init__ (self ,stream ,Reader ,Writer ,errors = 'strict' ):
306+ def __init__ (self , stream , Reader , Writer , errors = 'strict' ):
309307
310308 """ Creates a StreamReaderWriter instance.
311309
@@ -323,7 +321,7 @@ def __init__(self,stream,Reader,Writer,errors='strict'):
323321 self .writer = Writer (stream , errors )
324322 self .errors = errors
325323
326- def read (self ,size = - 1 ):
324+ def read (self , size = - 1 ):
327325
328326 return self .reader .read (size )
329327
@@ -335,11 +333,11 @@ def readlines(self, sizehint=None):
335333
336334 return self .reader .readlines (sizehint )
337335
338- def write (self ,data ):
336+ def write (self , data ):
339337
340338 return self .writer .write (data )
341339
342- def writelines (self ,list ):
340+ def writelines (self , list ):
343341
344342 return self .writer .writelines (list )
345343
@@ -348,13 +346,12 @@ def reset(self):
348346 self .reader .reset ()
349347 self .writer .reset ()
350348
351- def __getattr__ (self ,name ,
352-
349+ def __getattr__ (self , name ,
353350 getattr = getattr ):
354351
355352 """ Inherit all other methods from the underlying stream.
356353 """
357- return getattr (self .stream ,name )
354+ return getattr (self .stream , name )
358355
359356###
360357
@@ -379,7 +376,8 @@ class StreamRecoder:
379376 data_encoding = 'unknown'
380377 file_encoding = 'unknown'
381378
382- def __init__ (self ,stream ,encode ,decode ,Reader ,Writer ,errors = 'strict' ):
379+ def __init__ (self , stream , encode , decode , Reader , Writer ,
380+ errors = 'strict' ):
383381
384382 """ Creates a StreamRecoder instance which implements a two-way
385383 conversion: encode and decode work on the frontend (the
@@ -411,13 +409,13 @@ def __init__(self,stream,encode,decode,Reader,Writer,errors='strict'):
411409 self .writer = Writer (stream , errors )
412410 self .errors = errors
413411
414- def read (self ,size = - 1 ):
412+ def read (self , size = - 1 ):
415413
416414 data = self .reader .read (size )
417415 data , bytesencoded = self .encode (data , self .errors )
418416 return data
419417
420- def readline (self ,size = None ):
418+ def readline (self , size = None ):
421419
422420 if size is None :
423421 data = self .reader .readline ()
@@ -426,7 +424,7 @@ def readline(self,size=None):
426424 data , bytesencoded = self .encode (data , self .errors )
427425 return data
428426
429- def readlines (self ,sizehint = None ):
427+ def readlines (self , sizehint = None ):
430428
431429 if sizehint is None :
432430 data = self .reader .read ()
@@ -435,12 +433,12 @@ def readlines(self,sizehint=None):
435433 data , bytesencoded = self .encode (data , self .errors )
436434 return data .splitlines (1 )
437435
438- def write (self ,data ):
436+ def write (self , data ):
439437
440438 data , bytesdecoded = self .decode (data , self .errors )
441439 return self .writer .write (data )
442440
443- def writelines (self ,list ):
441+ def writelines (self , list ):
444442
445443 data = '' .join (list )
446444 data , bytesdecoded = self .decode (data , self .errors )
@@ -451,13 +449,12 @@ def reset(self):
451449 self .reader .reset ()
452450 self .writer .reset ()
453451
454- def __getattr__ (self ,name ,
455-
452+ def __getattr__ (self , name ,
456453 getattr = getattr ):
457454
458455 """ Inherit all other methods from the underlying stream.
459456 """
460- return getattr (self .stream ,name )
457+ return getattr (self .stream , name )
461458
462459### Shortcuts
463460
@@ -499,7 +496,7 @@ def open(filename, mode='rb', encoding=None, errors='strict', buffering=1):
499496 file = __builtin__ .open (filename , mode , buffering )
500497 if encoding is None :
501498 return file
502- (e ,d , sr ,sw ) = lookup (encoding )
499+ (e , d , sr , sw ) = lookup (encoding )
503500 srw = StreamReaderWriter (file , sr , sw , errors )
504501 # Add attributes to simplify introspection
505502 srw .encoding = encoding
@@ -535,7 +532,7 @@ def EncodedFile(file, data_encoding, file_encoding=None, errors='strict'):
535532 encode , decode = lookup (data_encoding )[:2 ]
536533 Reader , Writer = lookup (file_encoding )[2 :]
537534 sr = StreamRecoder (file ,
538- encode ,decode ,Reader ,Writer ,
535+ encode , decode , Reader , Writer ,
539536 errors )
540537 # Add attributes to simplify introspection
541538 sr .data_encoding = data_encoding
0 commit comments