General clean up, unused imports, text fixes.

Author: jrspruitt

ubireader/ubi/__init__.py

@@ -19,7 +19,6 @@
 
 from ubireader.debug import error
 from ubireader.ubi.block import sort, extract_blocks
-from ubireader.ubi.defines import UBI_EC_HDR_MAGIC, FILE_CHUNK_SZ
 from ubireader.ubi import display
 from ubireader.ubi.image import description as image
 from ubireader.ubi.block import layout, rm_old_blocks

ubireader/ubifs/list.py

@@ -19,7 +19,6 @@
 
 import os
 import time
-from ubireader import settings
 from ubireader.ubifs.defines import *
 from ubireader.ubifs import walk
 from ubireader.ubifs.misc import decompress

ubireader/ubifs/output.py

@@ -66,7 +66,7 @@ def extract_dents(ubifs, inodes, dent_node, path='', perms=False):
     inode = inodes[dent_node.inum]
 
     if not is_safe_path(path, dent_node.name):
-        error(extract_dents, 'Warn', 'Path traversal attempt: %s, discarding' % (dent_node.name))
+        error(extract_dents, 'Warn', 'Path traversal attempt: %s, discarding.' % (dent_node.name))
         return
     dent_path = os.path.realpath(os.path.join(path, dent_node.name))
 

ubireader/utils.py

@@ -60,7 +60,6 @@ def guess_start_offset(path, guess_offset=0):
     f.close()
 
 
-
 def guess_filetype(path, start_offset=0):
     log(guess_filetype, 'Looking for file type at %s' % start_offset)
 
@@ -82,7 +81,6 @@ def guess_filetype(path, start_offset=0):
     return ftype
 
 
-
 def guess_leb_size(path):
     """Get LEB size from superblock
 
@@ -127,7 +125,6 @@ def guess_leb_size(path):
     return block_size
 
 
-
 def guess_peb_size(path):
     """Determine the most likely block size
 
@@ -163,24 +160,24 @@ def guess_peb_size(path):
         file_offset += FILE_CHUNK_SZ
     f.close()
 
-    occurances = {}
+    occurrences = {}
     for i in range(0, len(offsets)):
         try:
             diff = offsets[i] - offsets[i-1]
         except:
             diff = offsets[i]
 
-        if diff not in occurances:
-            occurances[diff] = 0
+        if diff not in occurrences:
+            occurrences[diff] = 0
 
-        occurances[diff] += 1
+        occurrences[diff] += 1
 
     most_frequent = 0
     block_size = None
 
-    for offset in occurances:
-        if occurances[offset] > most_frequent:
-            most_frequent = occurances[offset]
+    for offset in occurrences:
+        if occurrences[offset] > most_frequent:
+            most_frequent = occurrences[offset]
             block_size = offset
 
-    return block_size
+    return block_size