Merge branch 'master' into generate-schema-command

Author: billyrrr

.python-version

@@ -1,2 +1 @@
-2.7.13
 3.6.1

.travis.yml

@@ -2,12 +2,6 @@ language: python
 
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27-flask010
-    - python: 2.7
-      env: TOXENV=py27-flask10
-    - python: 2.7
-      env: TOXENV=py27-flask104
     - python: 3.6
       env: TOXENV=py36-flask010
     - python: 3.6
@@ -34,9 +28,6 @@ matrix:
       sudo: true
   allow_failures:
     - env: TOXENV=py38-dev-flasklatest
-    - env: TOXENV=py27-flask010
-    - env: TOXENV=py27-flask10
-    - env: TOXENV=py27-flask104
 
 before_install:
   - pip install -r requirements.txt

flasgger/base.py

@@ -268,8 +268,7 @@ def loader(stream):
                 else:
                     def loader(stream):
                         return yaml.safe_load(
-                            parse_imports(stream.read(), filename)
-                        )
+                            parse_imports(stream.read(), filename))
         with codecs.open(filename, 'r', 'utf-8') as f:
             return loader(f)
 

flasgger/utils.py

@@ -2,7 +2,7 @@
 
 import codecs
 import copy
-import imp
+import importlib
 import inspect
 import os
 import re
@@ -583,7 +583,13 @@ def load_from_file(swag_path, swag_type='yml', root_path=None):
             path = swag_path.replace(
                 (root_path or os.path.dirname(__file__)), ''
             ).split(os.sep)[1:]
-            site_package = imp.find_module(path[0])[1]
+            package_spec = importlib.util.find_spec(path[0])
+            if package_spec.has_location:
+                # Improvement idea: Use package_spec.submodule_search_locations
+                # if we're sure there's only going to be one search location.
+                site_package = package_spec.origin.replace('/__init__.py', '')
+            else:
+                raise RuntimeError("Package does not have origin")
             swag_path = os.path.join(site_package, os.sep.join(path[1:]))
             with open(swag_path) as yaml_file:
                 return yaml_file.read()

setup.py

@@ -58,8 +58,6 @@ def grep(attrname):
     ],
     classifiers=[
         'Intended Audience :: Developers',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
     ],

tox.ini

@@ -5,7 +5,6 @@
 
 [tox]
 envlist =
-    py28-flask{010,012,10,104},
     py36-flask{010,012,10,104},
     py37-flask{010,012,10,104},
     py37-marshmallow-apispec,