curses module moved into no yEnc check (refs #1); some pep8 fixes too

Author: caronc

newsreap/lib/codecs/CodecYenc.py

@@ -62,6 +62,7 @@
     'crc32_1': 'crc32', 'crc32_2': 'crc32',
 }
 
+
 class YencError(Exception):
     """ Class for specific yEnc errors
     """
@@ -91,30 +92,31 @@ def __str__(self):
     # the below code was based on the yEnc libraries.  But
     # the part that is blisterily fast (Written in C) will
     # be writting in python (a much slower solution)
-
     FAST_YENC_SUPPORT = False
 
-YENC42 = ''.join(map(lambda x: chr((x-42) & 255), range(256)))
-
-# a map that identifies all of the special keywords used by
-# yEnc which need a special conversion done to them before
-# We use the curses.ascii table to make our code easier to read
-from curses import ascii
-YENC_DECODE_SPECIAL_MAP = dict([('=%s' % chr(k+64), chr(k)) for k in (
-    # Non-Printable
-    ascii.NUL, ascii.LF, ascii.CR, ascii.SP, ascii.TAB,
-
-    # Printable
-    ord('.'), ord('='),
-)] + [
-    # Ignore Types (we simply ignore these types if they are found)
-    (chr(ascii.LF), ''), (chr(ascii.CR), ''),
-])
-
-# Compile our map into a decode table
-YENC_DECODE_SPECIAL_RE = re.compile(
-    r'(' + r'|'.join(YENC_DECODE_SPECIAL_MAP.keys()) + r')',
-)
+    # A Translation Map
+    YENC42 = ''.join(map(lambda x: chr((x-42) & 255), range(256)))
+
+    # a map that identifies all of the special keywords used by
+    # yEnc which need a special conversion done to them before
+    # We use the curses.ascii table to make our code easier to read
+    from curses import ascii
+    YENC_DECODE_SPECIAL_MAP = dict([('=%s' % chr(k+64), chr(k)) for k in (
+        # Non-Printable
+        ascii.NUL, ascii.LF, ascii.CR, ascii.SP, ascii.TAB,
+
+        # Printable
+        ord('.'), ord('='),
+    )] + [
+        # Ignore Types (we simply ignore these types if they are found)
+        (chr(ascii.LF), ''), (chr(ascii.CR), ''),
+    ])
+
+    # Compile our map into a decode table
+    YENC_DECODE_SPECIAL_RE = re.compile(
+        r'(' + r'|'.join(YENC_DECODE_SPECIAL_MAP.keys()) + r')',
+    )
+
 
 class CodecYenc(CodecBase):
 
@@ -133,7 +135,6 @@ def __init__(self, descriptor=None, tmp_dir=None, *args, **kwargs):
         # content
         self.decoded = None
 
-
     def detect(self, line, relative=True):
         """
         A Simple function that can be used to determine if there is
@@ -186,7 +187,6 @@ def detect(self, line, relative=True):
 
         return f_map
 
-
     def decode(self, stream):
         """ Decode some data and decode the data
             to descriptor identified (by the stream)
@@ -290,7 +290,7 @@ def decode(self, stream):
                 except YencError:
                     logger.warning(
                         "Corruption on line %d." % \
-                                 self._lines,
+                        self._lines,
                     )
 
                     # Line Tracking
@@ -334,14 +334,13 @@ def decode(self, stream):
         # Reset part information
         self._part_no = 1
 
-        if  self.decoded:
+        if self.decoded:
             # close article when complete
             self.decoded.close()
 
         # Return what we do have
         return self.decoded
 
-
     def reset(self):
         """
         Reset our decoded content
@@ -359,14 +358,12 @@ def reset(self):
         # content
         self.decoded = None
 
-
     def __lt__(self, other):
         """
         Sorts by part number
         """
         return self._part_no < other._part_no
 
-
     def __str__(self):
         """
         Return a printable version of the file being read
@@ -382,7 +379,6 @@ def __str__(self):
             fname
         )
 
-
     def __repr__(self):
         """
         Return a printable object