Merge pull request #993 from diraol/fix_pkg_resources

diraol · web-flow · commit 166268a4882c · 2019-02-21T10:01:43.000-03:00
Get the package loader instead of its spec.
diff --git a/AUTHORS b/AUTHORS
@@ -9,34 +9,34 @@ Maintainers:
 Contributors:
 
 * Alvin Francis (http://github.com/alvinfrancis);
-* Amir Eldor (https://github.com/amireldor)
-* Andriy Kohut (https://github.com/andriykohut)
+* Amir Eldor (https://github.com/amireldor);
+* Andriy Kohut (https://github.com/andriykohut);
 * Anler Hp (http://github.com/ikame);
 * Anton Parkhomenko (http://github.com/chuwy);
 * Ashley Hewson (http://github.com/ashleyh);
 * Ben Davis (https://github.com/bendavis78);
 * Benjamin Ruston (http://github.com/bruston);
-* Boatx (https://github.com/boatx)
+* Boatx (https://github.com/boatx);
 * Boris Filippov (http://github.com/frenzykryger);
 * Brad Belyeu (https://github.com/bbelyeu);
-* Brad Mease (http://github.com/bmease)
-* Brendan Maguire (https://github.com/brendanmaguire)
-* Bryce Guinta (https://github.com/brycepg)
-* Daniel Hahler (http://github.com/blueyed)
+* Brad Mease (http://github.com/bmease);
+* Brendan Maguire (https://github.com/brendanmaguire);
+* Bryce Guinta (https://github.com/brycepg);
+* Daniel Hahler (http://github.com/blueyed);
 * David Vogt (http://github.com/winged);
 * Denis Kasak (http://github.com/dkasak);
-* Diego Rabatone Oliveira (https://github.com/diraol)
+* Diego Rabatone Oliveira (https://github.com/diraol);
 * Dimitrios Semitsoglou-Tsiapos (https://github.com/dset0x);
 * Dirk Wallenstein (http://github.com/dirkwallenstein);
-* Filip Poboril (https://github.com/fpob)
+* Filip Poboril (https://github.com/fpob);
 * Florent Xicluna (http://github.com/florentx);
 * Fredrik Henrysson (http://github.com/fhenrysson);
 * fwuzju (https://github.com/fwuzju);
 * Grzegorz Janik (http://github.com/glujan);
 * Igor Guerrero (http://github.com/igorgue);
-* Jacob Niehus (https://github.com/wilywampa)
-* Jason Harvey (http://github.com/alienth)
-* Jay Rainey (https://github.com/jawrainey)
+* Jacob Niehus (https://github.com/wilywampa);
+* Jason Harvey (http://github.com/alienth);
+* Jay Rainey (https://github.com/jawrainey);
 * Jonathan McCall (http://github.com/Jonnymcc);
 * Kevin Deldycke (http://github.com/kdeldycke);
 * Kurtis Rader (https://github.com/krader1961);
diff --git a/pymode/libs/pkg_resources/__init__.py b/pymode/libs/pkg_resources/__init__.py
@@ -2188,14 +2188,19 @@ def _handle_ns(packageName, path_item):
         # As `find_module` is deprecated for newer python, we try `find_spec`
         # first.
         try:
-            loader = importer.find_spec(packageName)
+            spec = importer.find_spec(packageName)
+            if spec:
+                loader = spec.loader
+            else:
+                return None
         except AttributeError:
             loader = importer.find_module(packageName)
     else:
         try:
             loader = importer.find_module(packageName)
         except ImportError:
-            loader = None
+            return None
+
     if loader is None:
         return None
 
