Merge pull request #1328 from m-kuhn/httplib2

alexbruy · alexbruy · commit 7414a80dfbb5 · 2014-05-07T10:38:00.000+03:00
[processing] Fallback to external httplib2 when internal is not available
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')
