Reordered exception handling while parsing response

Author: alexis-mignon

README.md

@@ -12,7 +12,7 @@ The project provides an almost exhaustive access to the [Flickr API](https://www
 pip install flickr_api
 ```
 
-2. Aquire Flickr API keys and set up authorisation as per the [Wiki](https://github.com/alexis-mignon/python-flickr-api/wiki/Tutorial)
+2. Aquire Flickr API keys and set up authorisation as per the [Wiki](https://github.com/alexis-mignon/python-flickr-api/wiki/Flickr-API-Keys-and-Authentication)
 
 3. Start using the OO interface!
 
@@ -26,17 +26,19 @@ photos = user.getPhotos()
 If you've authorised yourself as a user, you can do cooler things like upload photos:
 
 ```python
-flickr_api.upload(photo_file = "path_to_the_photo_file", title = "My title")
+flickr_api.upload(photo_file="path_to_the_photo_file", title="My title")
 ```
 
 And even create albums (a.k.a Photosets):
 
 ```python
-photoset = flickr_api.Photoset.create(title = "The title of the photoset", primary_photo = cover_photo)
+photoset = flickr_api.Photoset.create(title="The title of the photoset", primary_photo=cover_photo)
 ```
 
 ## Features
 
+Consult the [API Reference](https://github.com/alexis-mignon/python-flickr-api/wiki/API-reference) for a (semi) complete list
+
 * Object Oriented implementation
 * (Almost) comprehensive implementation
 * Uses OAuth for authentication
@@ -54,7 +56,12 @@ Please note that `flickrapi` on Pypi is a different distribution by a different
 
 ## API Guide
 
-A brief guide is available in the [Wiki section](https://github.com/alexis-mignon/python-flickr-api/wiki/Tutorial).
+A brief guide is available in the [Wiki section](https://github.com/alexis-mignon/python-flickr-api/wiki/).
+
+## Projects using this API
+> create a PR to add your project here!
+
+* [FlickrBox](https://github.com/tomquirk/FlickrBox) - A Dropbox-like backup experience for your free 1TB Flickr library!
 
 ## Notes
 

flickr_api/method_call.py

@@ -107,15 +107,15 @@ def call_api(api_key=None, api_secret=None, auth_handler=None,
             query_elements = args.items()
             query_elements.sort()
             sig = keys.API_SECRET + \
-                  ["".join(["".join(e) for e in query_elements])]
+                ["".join(["".join(e) for e in query_elements])]
             m = hashlib.md5()
             m.update(sig)
             api_sig = m.digest()
             args["api_sig"] = api_sig
         data = urllib.parse.urlencode(args)
     else:
         data = auth_handler.complete_parameters(
-             url=request_url, params=args
+            url=request_url, params=args
         ).to_postdata()
 
     if CACHE is None:
@@ -129,10 +129,13 @@ def call_api(api_key=None, api_secret=None, auth_handler=None,
         return resp
 
     try:
-        resp = json.loads(resp)
+        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)
     except ValueError as e:
         logger.error("Could not parse response: %s", str(resp))
-        raise e
 
     if resp["stat"] != "ok":
         raise FlickrAPIError(resp["code"], resp["message"])

flickr_api/objects.py

@@ -777,7 +777,7 @@ def format_result(r, token=None):
             info = r["photosets"]
             photosets = info.pop("photoset")
             if not isinstance(photosets, list):
-                phototsets = [photosets]
+                photosets = [photosets]
             return FlickrList(
                 [Photoset(token=token, **ps) for ps in photosets],
                  Info(**info)
@@ -1303,7 +1303,7 @@ def save(self, filename, size_label=None):
             given size.
 
         Arguments:
-            filename: target file name
+            filename: target file name (without extension)
 
             size_label: The label corresponding to the photo size
 
@@ -1317,8 +1317,12 @@ def save(self, filename, size_label=None):
         """
         if size_label is None:
             size_label = self._getLargestSizeLabel()
-        r = urllib.request.urlopen(self.getPhotoFile(size_label))
-        with open(filename, 'wb') as f:
+            
+        photo_file = self.getPhotoFile(size_label)
+        file_ext = '.' + photo_file.split('.')[-1]
+        r = urllib.request.urlopen(photo_file)
+
+        with open(filename + file_ext, 'wb') as f:
             f.write(r.read())
             f.close()