Merge pull request #1328 from m-kuhn/httplib2

[processing] Fallback to external httplib2 when internal is not available
qgis · May 7, 2014 · 7414a80 · 7414a80
2 parents 26e98f7 + 2f2982f
commit 7414a80
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/python/plugins/processing/algs/admintools/geoserver/catalog.py b/python/plugins/processing/algs/admintools/geoserver/catalog.py
@@ -41,7 +41,11 @@
     UnsavedLayerGroup
 from workspace import workspace_from_index, \
     Workspace
-from processing.algs.admintools import httplib2
+try:
+    from processing.algs.admintools import httplib2
+except ImportError:
+    # If compiled without internal httplib2: Load external
+    import httplib2
 
 
 logger = logging.getLogger('gsconfig.catalog')