Merge

1 files changed, 8 insertions, 5 deletions

diff --git a/astroid/modutils.py b/astroid/modutils.py
index e5880eb..ea34244 100644
--- a/astroid/modutils.py
+++ b/astroid/modutils.py
@@ -28,8 +28,6 @@
 """
 from __future__ import with_statement
 
-__docformat__ = "restructuredtext en"
-
 import imp
 import os
 import platform
@@ -37,6 +35,7 @@ import sys
 from distutils.sysconfig import get_python_lib
 from distutils.errors import DistutilsPlatformError
 import zipimport
+import scandir
 
 try:
     import pkg_resources
@@ -403,7 +402,7 @@ def get_module_part(dotted_name, context_file=None):
     return dotted_name
 
 
-def get_module_files(src_directory, blacklist):
+def get_module_files(src_directory, blacklist, list_all=False):
     """given a package directory return a list of all available python
     module's files in the package and its subpackages
 
@@ -415,16 +414,20 @@ def get_module_files(src_directory, blacklist):
     :param blacklist: iterable
       list of files or directories to ignore.
 
+    :type list_all: bool
+    :param list_all:
+        get files from all paths, including ones without __init__.py
+
     :rtype: list
     :return:
       the list of all available python module's files in the package and
       its subpackages
     """
     files = []
-    for directory, dirnames, filenames in os.walk(src_directory):
+    for directory, dirnames, filenames in scandir.walk(src_directory):
         _handle_blacklist(blacklist, dirnames, filenames)
         # check for __init__.py
-        if not '__init__.py' in filenames:
+        if not list_all and not '__init__.py' in filenames:
             dirnames[:] = ()
             continue
         for filename in filenames: