Add __init__.py to modules as a package import

from test_project.folder import ...

should import module in test_project/folder/__init__.py

and all the modules within the folder
for working out if taint propagates.

Author: bcaller

examples/test_project/folder/__init__.py

@@ -52,14 +52,10 @@ def get_modules(path):
                     '.'
                 )
                 directory = directory.replace('.', '', 1)
-                if directory:
-                    modules.append(
-                        ('.'.join((module_root, directory, filename.replace('.py', ''))), os.path.join(root, filename))
-                    )
-                else:
-                    modules.append(
-                        ('.'.join((module_root, filename.replace('.py', ''))), os.path.join(root, filename))
-                    )
+                modules.append((
+                    '.'.join(p for p in (module_root, directory, _filename_to_module(filename)) if p),
+                    os.path.join(root, filename)
+                ))
 
     return modules
 
@@ -68,3 +64,10 @@ def _is_python_file(path):
     if os.path.splitext(path)[1] == '.py':
         return True
     return False
+
+
+def _filename_to_module(filename):
+    if filename == '__init__.py':
+        return ''
+    else:
+        return os.path.splitext(filename)[0]

pyt/core/project_handler.py

@@ -32,28 +32,32 @@ def test_get_modules(self):
         utils_path = os.path.join(project_folder, 'utils.py')
         exceptions_path = os.path.join(project_folder, 'exceptions.py')
         some_path = os.path.join(project_folder, folder, 'some.py')
+        __init__path = os.path.join(project_folder, folder, '__init__.py')
         indhold_path = os.path.join(project_folder, folder, directory, 'indhold.py')
 
         # relative_folder_name = '.' + folder
         app_name = project_namespace + '.' + 'app'
         utils_name = project_namespace + '.' + 'utils'
         exceptions_name = project_namespace + '.' + 'exceptions'
         some_name = project_namespace + '.' + folder + '.some'
+        __init__name = project_namespace + '.' + folder
         indhold_name = project_namespace + '.' + folder + '.' + directory + '.indhold'
 
         app_tuple = (app_name, app_path)
         utils_tuple = (utils_name, utils_path)
         exceptions_tuple = (exceptions_name, exceptions_path)
         some_tuple = (some_name, some_path)
+        __init__tuple = (__init__name, __init__path)
         indhold_tuple = (indhold_name, indhold_path)
 
         self.assertIn(app_tuple, modules)
         self.assertIn(utils_tuple, modules)
         self.assertIn(exceptions_tuple, modules)
         self.assertIn(some_tuple, modules)
+        self.assertIn(__init__tuple, modules)
         self.assertIn(indhold_tuple, modules)
 
-        self.assertEqual(len(modules), 5)
+        self.assertEqual(len(modules), 6)
 
     def test_get_modules_and_packages(self):
         project_folder = os.path.normpath(os.path.join('examples', 'test_project'))
@@ -104,4 +108,4 @@ def test_get_modules_and_packages(self):
         self.assertIn(some_tuple, modules)
         self.assertIn(indhold_tuple, modules)
 
-        self.assertEqual(len(modules), 7)
+        self.assertEqual(len(modules), 8)