Merge pull request #88 from alexis-mignon/net_requests

Net requests

Author: alexis-mignon

README.md

@@ -51,6 +51,7 @@ Requires:
 * python >= 2.7
 * [python-oauth2](https://github.com/joestump/python-oauth2)
 * [six](https://github.com/benjaminp/six)
+* requests
 
 Please note that `flickrapi` on Pypi is a different distribution by a different author.
 

flickr_api/_version.py

@@ -3,4 +3,4 @@
     Allows to define the version number uniquely.
 """
 
-__version__ = "0.5"
+__version__ = "0.6"

flickr_api/method_call.py

@@ -10,6 +10,7 @@
 """
 from six.moves import urllib
 from six import iteritems
+import requests
 import hashlib
 import json
 import logging
@@ -104,36 +105,36 @@ def call_api(api_key=None, api_secret=None, auth_handler=None,
 
     if auth_handler is None:
         if needssigning:
-            query_elements = args.items()
+            query_elements = list(args.items())
             query_elements.sort()
             sig = keys.API_SECRET + \
                 ["".join(["".join(e) for e in query_elements])]
             m = hashlib.md5()
             m.update(sig)
             api_sig = m.digest()
             args["api_sig"] = api_sig
+        # Used to hash the arguments for cache
         data = urllib.parse.urlencode(args)
     else:
-        data = auth_handler.complete_parameters(
+        args = auth_handler.complete_parameters(
             url=request_url, params=args
-        ).to_postdata()
+        )
+        # Used to hash the arguments for cache
+        data = args.to_postdata()
 
     if CACHE is None:
-        resp = send_request(request_url, data)
+        resp = requests.post(request_url, args)
     else:
-        resp = CACHE.get(data) or send_request(request_url, data)
+        resp = CACHE.get(data) or requests(request_url, args)
         if data not in CACHE:
             CACHE.set(data, resp)
 
+    resp = resp.content
     if raw:
         return resp
 
     try:
-        try:
-            resp = json.loads(resp.decode())
-        except AttributeError:
-            # exception for python 3 where `resp` is a string (doesn't need decoding)
-            resp = json.loads(resp)
+        resp = json.loads(resp)
     except ValueError as e:
         logger.error("Could not parse response: %s", str(resp))
 

flickr_api/multipart.py

@@ -290,6 +290,7 @@ def static_call(*args, **kwargs):
             token, kwargs = _get_token(None, **kwargs)
             method_args, format_result = method(*args, **kwargs)
             method_args["auth_handler"] = token
+            logger.debug("Calling method '%s' with arguments: %s", flickr_method, str(method_args))
             r = method_call.call_api(method=flickr_method, **method_args)
             try:
                 return format_result(r, token)

flickr_api/reflection.py

@@ -18,10 +18,10 @@
 from .flickrerrors import FlickrError, FlickrAPIError
 from .objects import Photo, UploadTicket
 from . import auth
-from . import multipart
 import os
 from xml.etree import ElementTree as ET
 from six import text_type, binary_type, iteritems
+import requests
 
 UPLOAD_URL = "https://api.flickr.com/services/upload/"
 REPLACE_URL = "https://api.flickr.com/services/replace/"
@@ -47,16 +47,19 @@ def post(url, auth_handler, args, photo_file, photo_file_data=None):
 
     params = auth_handler.complete_parameters(url, args)
 
-    fields = params.items()
     if photo_file_data is None:
-        files = [("photo", os.path.basename(photo_file), open(photo_file, "rb").read())]
-    else:
-        files = [("photo", os.path.basename(photo_file), photo_file_data.read())]
+        photo_file_data = open(photo_file, "rb")
+
+    files = {
+        "photo": (os.path.basename(photo_file), photo_file_data.read())
+    }
 
-    r, data = multipart.posturl(url, fields, files)
-    if r.status != 200:
+    resp = requests.post(url, params, files=files)
+    data = resp.content
+
+    if resp.status_code != 200:
         raise FlickrError("HTTP Error %i: %s" % (r.status, data))
-    
+
     r = ET.fromstring(data)
     if r.get("stat") != 'ok':
         err = r[0]
@@ -141,7 +144,7 @@ def replace(**args):
 
     """
     if "async" not in args:
-        args["async"] = True
+        args["async"] = False
     if "photo" in args:
         args["photo_id"] = args.pop("photo").id
 
@@ -155,9 +158,10 @@ def replace(**args):
     r = post(REPLACE_URL, auth.AUTH_HANDLER, args, photo_file, photo_file_data)
 
     t = r[0]
+
     if t.tag == 'photoid':
         return Photo(id=t.text)
     elif t.tag == 'ticketid':
-        return UploadTicket(id=t.text, secret=t.secret)
+        return UploadTicket(id=t.text)
     else:
         raise FlickrError("Unexpected tag: %s" % t.tag)