[conduit] use system installed flickrapi >= 1.2

[John Stowers <jstowers src gnome org>]

commit 42ba1f38cae62547e45350456cd7b755592129d3
Author: John Stowers <john stowers gmail com>
Date:   Sun Nov 22 15:22:09 2009 +0100

    use system installed flickrapi >= 1.2

 conduit/modules/FlickrModule/FlickrModule.py       |   28 +-
 conduit/modules/FlickrModule/Makefile.am           |    2 -
 conduit/modules/FlickrModule/flickrapi/LICENSE     |   27 -
 conduit/modules/FlickrModule/flickrapi/Makefile.am |    5 -
 conduit/modules/FlickrModule/flickrapi/__init__.py |  772 --------------------
 conduit/modules/FlickrModule/flickrapi/cache.py    |  105 ---
 .../modules/FlickrModule/flickrapi/exceptions.py   |   15 -
 .../modules/FlickrModule/flickrapi/multipart.py    |  101 ---
 .../FlickrModule/flickrapi/reportinghttp.py        |  101 ---
 .../modules/FlickrModule/flickrapi/tokencache.py   |   93 ---
 conduit/modules/FlickrModule/flickrapi/xmlnode.py  |  102 ---
 configure.ac                                       |    1 -
 12 files changed, 14 insertions(+), 1338 deletions(-)
---
diff --git a/conduit/modules/FlickrModule/FlickrModule.py b/conduit/modules/FlickrModule/FlickrModule.py
index 52ad725..80caaa3 100644
--- a/conduit/modules/FlickrModule/FlickrModule.py
+++ b/conduit/modules/FlickrModule/FlickrModule.py
@@ -14,21 +14,21 @@ from conduit.datatypes import Rid
 
 from gettext import gettext as _
 
-#We have to use our own flickrapi until the following is applied
-#http://sourceforge.net/tracker/index.php?func=detail&aid=1874067&group_id=203043&atid=984009
-Utils.dataprovider_add_dir_to_path(__file__)
-import flickrapi
-
-if flickrapi.__version__ == "1.1":
-    MODULES = {
-    	"FlickrTwoWay" :          { "type": "dataprovider" }        
-    }
-    log.info("Module Information: %s" % Utils.get_module_information(flickrapi, "__version__"))
-    #turn of debugging in the library
-    flickrapi.set_log_level(logging.NOTSET)
-else:
-    MODULES = {}
-    log.info("Flickr support disabled")
+MODULES = {}
+try:
+    import flickrapi
+    if flickrapi.__version__ >= "1.2":
+        MODULES = {
+        	"FlickrTwoWay" :          { "type": "dataprovider" }        
+        }
+        log.info("Module Information: %s" % Utils.get_module_information(flickrapi, "__version__"))
+        #turn of debugging in the library
+        flickrapi.set_log_level(logging.NOTSET)
+except ImportError:
+    pass
+
+if not MODULES:
+    log.info("Flickr support disabled. Please install python-flickrapi > 1.2")
     
 class MyFlickrAPI(flickrapi.FlickrAPI):
     """
diff --git a/conduit/modules/FlickrModule/Makefile.am b/conduit/modules/FlickrModule/Makefile.am
index 4e8fbe3..2f65387 100644
--- a/conduit/modules/FlickrModule/Makefile.am
+++ b/conduit/modules/FlickrModule/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = flickrapi
-
 conduit_handlersdir = $(libdir)/conduit/modules/FlickrModule
 conduit_handlers_PYTHON = FlickrModule.py
 
diff --git a/configure.ac b/configure.ac
index e3d6163..1a8938b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,7 +179,6 @@ conduit/modules/EvolutionModule/Makefile
 conduit/modules/FileModule/Makefile
 conduit/modules/FeedModule/Makefile
 conduit/modules/FlickrModule/Makefile
-conduit/modules/FlickrModule/flickrapi/Makefile
 conduit/modules/FacebookModule/Makefile
 conduit/modules/FacebookModule/pyfacebook/Makefile
 conduit/modules/FspotModule/Makefile