Merge pull request #825 from bradleyg/patch-1

Catch import error on AppEngine.

Merge pull request #825 from bradleyg/patch-1
Catch import error on AppEngine.
22a462c6 · Serge S. Koval · 5f1b2d88 · 447e4f9f · 22a462c6
Commit 22a462c6 authored Mar 26, 2015 by Serge S. Koval
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

__init__.py flask_admin/contrib/__init__.py +4 -1

No files found.
--- a/flask_admin/contrib/__init__.py
+++ b/flask_admin/contrib/__init__.py
-__import__('pkg_resources').declare_namespace(__name__)
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    pass