new version

hivesolutions · Sep 5, 2017 · 3188485 · 3188485
1 parent 41c539f
commit 3188485
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
 
 setuptools.setup(
     name = "flickr_api_python",
-    version = "0.1.1",
+    version = "0.1.2",
     author = "Hive Solutions Lda.",
     author_email = "development@hive.pt",
     description = "Flickr API Client",

diff --git a/src/examples/base.py b/src/examples/base.py
@@ -42,7 +42,7 @@
 import flickr
 
 def get_api():
-    return flickr.Api(
+    return flickr.API(
         client_key = appier.conf("FLICKR_KEY"),
         client_secret = appier.conf("FLICKR_SECRET"),
         redirect_url = appier.conf("FLICKR_REDIRECT_URL")

diff --git a/src/flickr/__init__.py b/src/flickr/__init__.py
@@ -37,5 +37,5 @@
 from . import base
 from . import set
 
-from .base import BASE_URL, Api
-from .set import SetApi
+from .base import BASE_URL, API
+from .set import SetAPI
diff --git a/src/flickr/base.py b/src/flickr/base.py
@@ -59,9 +59,9 @@
 """ The redirect url used as default (fallback) value
 in case none is provided to the api (client) """
 
-class Api(
-    appier.OAuth1Api,
-    set.SetApi
+class API(
+    appier.OAuth1API,
+    set.SetAPI
 ):
     """
     Implementation of the basic Flickr API according to the
@@ -76,7 +76,7 @@ class Api(
     """
 
     def __init__(self, *args, **kwargs):
-        appier.OAuth1Api.__init__(self, *args, **kwargs)
+        appier.OAuth1API.__init__(self, *args, **kwargs)
         self.client_key = appier.conf("FLICKR_KEY", CLIENT_KEY)
         self.client_secret = appier.conf("FLICKR_SECRET", CLIENT_SECRET)
         self.redirect_url = appier.conf("FLICKR_REDIRECT_URL", REDIRECT_URL)
@@ -107,7 +107,7 @@ def build(
         mime = None,
         kwargs = None
     ):
-        appier.OAuth1Api.build(self, method, url, headers, kwargs)
+        appier.OAuth1API.build(self, method, url, headers, kwargs)
         if not method == "GET": return
         format = kwargs.get("format", "json")
         kwargs["format"] = format

diff --git a/src/flickr/set.py b/src/flickr/set.py
@@ -37,7 +37,7 @@
 __license__ = "Apache License, Version 2.0"
 """ The license for the module """
 
-class SetApi(object):
+class SetAPI(object):
 
     def list_sets(self):
         url = self.base_url + "rest"