Merge 5d73130 into 03d732c

MasoniteFramework · Aug 28, 2018 · a062d75 · a062d75
2 parents 03d732c + 5d73130
commit a062d75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/masonite/autoload.py b/masonite/autoload.py
@@ -49,7 +49,7 @@ def load(self, directories, instantiate=False):
             for obj in inspect.getmembers(self._get_module_members(module_loader, name)):
 
                 # If the object is a class and the objects module starts with the search path
-                if inspect.isclass(obj[1]) and obj[1].__module__.startswith(search_path.replace('/', '.')):
+                if inspect.isclass(obj[1]) and obj[1].__module__.split('.')[:-1] == search_path.split('/'):
                     if self.app.has(obj[1].__name__) and not self.app.make(obj[1].__name__).__module__.startswith(search_path):
                         raise AutoloadContainerOverwrite(
                             'Container already has the key: {}. Cannot overwrite a container key that exists outside of your application.'.format(obj[1].__name__))

diff --git a/masonite/info.py b/masonite/info.py
@@ -1,4 +1,4 @@
 """Module for specifying the Masonite version in a central location.
 """
 
-VERSION = '2.0.16'
+VERSION = '2.0.17'