Revert "external httplib2"

Unintentional change This reverts commit 92d3f8a.
qgis · Mar 11, 2014 · 29ee8dd · 29ee8dd
1 parent c0cbfac
commit 29ee8dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/python/plugins/processing/admintools/CMakeLists.txt b/python/plugins/processing/admintools/CMakeLists.txt
@@ -1,5 +1,6 @@
 FILE(GLOB PY_FILES *.py)
 
 ADD_SUBDIRECTORY(geoserver)
+ADD_SUBDIRECTORY(httplib2)
 
-PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
+PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
diff --git a/python/plugins/processing/admintools/geoserver/catalog.py b/python/plugins/processing/admintools/geoserver/catalog.py
@@ -41,7 +41,7 @@
     UnsavedLayerGroup
 from processing.admintools.geoserver.workspace import workspace_from_index, \
     Workspace
-import httplib2
+from processing.admintools import httplib2
 
 
 logger = logging.getLogger('gsconfig.catalog')