Merge pull request #2 from michael-borisov/master

Fix indentation, pep8. Optimize imports and adding missing import for sy...

pipreqs/pipreqs.py

@@ -11,34 +11,39 @@ Options:
     --savepath path to requirements.txt (Optional)
 """
 from __future__ import print_function
-import os, re, logging
+import os
+import sys
+import re
+import logging
+
 from docopt import docopt
 import yarg
 from yarg.exceptions import HTTPError
 
+
 REGEXP = [
     re.compile(r'^import (.+)$'),
     re.compile(r'from (.*?) import (?:.*)')
 ]
 
+
 def get_all_imports(start_path):
     imports = []
     packages = []
     logging.debug('Traversing tree, start: %s', start_path)
     for root, dirs, files in os.walk(start_path):
-		path = root.split('/')
         packages.append(os.path.basename(root))
-		for file in files:
-			if file[-3:] != ".py":
+        for file_name in files:
+            if file_name[-3:] != ".py":
                 continue
-			for rex in REGEXP:
-				with open(os.path.join(root,file), "r") as f:
-					lines = f.readlines()
-					for line in lines:
+
+            with open(os.path.join(root, file_name), "r") as file_object:
+                for line in file_object:
                     if line[0] == "#":
                         continue
                     if "(" in line:
                         break
+                    for rex in REGEXP:
                         s = rex.match(line)
                         if not s:
                             continue
@@ -55,6 +60,7 @@ def get_all_imports(start_path):
         data = [x.strip() for x in f.readlines()]
         return list(set(third_party_packages) - set(data))
 
+
 def generate_requirements_file(path, imports):
     with open(path, "w") as ff:
         logging.debug('Writing requirements to file %s', path)
@@ -62,6 +68,7 @@ def generate_requirements_file(path, imports):
             ff.write(item['name'] + "==" + item['version'])
             ff.write("\n")
 
+
 def get_imports_info(imports):
     result = []
     for item in imports:
@@ -76,6 +83,7 @@ def get_imports_info(imports):
         result.append({'name': item, 'version': last_release})
     return result
 
+
 def init(args):
     print("Looking for imports")
     imports = get_all_imports(args['<path>'])
@@ -86,6 +94,7 @@ def init(args):
     generate_requirements_file(path, imports_with_info)
     print("Successfuly saved requirements file in: " + path)
 
+
 def main():  # pragma: no cover
     args = docopt(__doc__, version='xstat 0.1')
     log_level = logging.WARNING
@@ -98,5 +107,6 @@ def main(): # pragma: no cover
     except KeyboardInterrupt:
         sys.exit(0)
 
+
 if __name__ == '__main__':
     main()  # pragma: no cover

tests/test_pipreqs.py

@@ -14,7 +14,6 @@ from pipreqs import pipreqs
 
 
 class TestPipreqs(unittest.TestCase):
-
     def setUp(self):
         self.modules = ['flask', 'requests', 'sqlalchemy', 'docopt', 'nonexistendmodule']
         self.project = os.path.join(os.path.dirname(__file__), "_data")
@@ -52,5 +51,6 @@ class TestPipreqs(unittest.TestCase):
         except OSError:
             pass
 
+
 if __name__ == '__main__':
     unittest.main()