Fix tests and pep88

Author: yoavaviram

amazon/__init__.py

@@ -6,5 +6,5 @@
 Amazon Product Advertising API Client library.
 """
 
-__version__ = '2.0.2'
+__version__ = '2.1.0'
 __author__ = 'Yoav Aviram'

amazon/api.py

@@ -199,7 +199,8 @@ def lookup(self, ResponseGroup="Large", **kwargs):
     def lookup_bulk(self, ResponseGroup="Large", **kwargs):
         """Lookup Amazon Products in bulk.
 
-        Returns all products matching requested ASINs, ignoring invalid entries.
+        Returns all products matching requested ASINs, ignoring invalid
+        entries.
 
         :return:
             A list of  :class:`~.AmazonProduct` instances.
@@ -340,14 +341,12 @@ def cart_add(self, items, CartId=None, HMAC=None, **kwargs):
         if len(items) > 10:
             raise CartException("You can't add more than 10 items at once")
 
-        offer_id_key_template = 'Item.%s.OfferListingId'
-        quantity_key_template = 'Item.%s.Quantity'
-        i = 0
+        offer_id_key_template = 'Item.{0}.OfferListingId'
+        quantity_key_template = 'Item.{0}.Quantity'
 
-        for item in items:
-            i += 1
-            kwargs[offer_id_key_template % (i, )] = item['offer_id']
-            kwargs[quantity_key_template % (i, )] = item['quantity']
+        for i, item in enumerate(items):
+            kwargs[offer_id_key_template.format(i)] = item['offer_id']
+            kwargs[quantity_key_template.format(i)] = item['quantity']
 
         response = self.api.CartAdd(CartId=CartId, HMAC=HMAC, **kwargs)
         root = objectify.fromstring(response)
@@ -717,11 +716,12 @@ def price_and_currency(self):
     @property
     def offer_id(self):
         """Offer ID
-        
+
         :return:
             Offer ID (string).
         """
-        return self._safe_get_element('Offers.Offer.OfferListing.OfferListingId')
+        return self._safe_get_element(
+            'Offers.Offer.OfferListing.OfferListingId')
 
     @property
     def asin(self):

test-requirements.txt

@@ -1 +1,2 @@
 Sphinx==1.1.3 
+mock

tests.py

@@ -1,7 +1,7 @@
 import unittest
 import mock
 
-from nose.tools import assert_equals, assert_true, assert_false
+from nose.tools import assert_equals, assert_true, assert_false, assert_raises
 
 import datetime
 from amazon.api import (AmazonAPI,
@@ -15,7 +15,7 @@
                            AMAZON_ASSOC_TAG)
 
 
-TEST_ASIN = "B007HCCNJU"
+TEST_ASIN = "0312098286"
 
 PRODUCT_ATTRIBUTES = [
     'asin', 'author', 'binding', 'brand', 'browse_nodes', 'ean', 'edition',
@@ -110,14 +110,14 @@ def test_lookup_nonexistent_asin(self):
 
         Tests that a product lookup for a nonexistent ASIN raises AsinNotFound.
         """
-        self.assertRaises(AsinNotFound, self.amazon.lookup, ItemId="ABCD1234")
+        assert_raises(AsinNotFound, self.amazon.lookup, ItemId="ABCD1234")
 
     def test_batch_lookup(self):
         """Test Batch Product Lookup.
 
         Tests that a batch product lookup request returns multiple results.
         """
-        asins = ['B007HCCNJU', 'B00BWYQ9YE',
+        asins = [TEST_ASIN, 'B00BWYQ9YE',
                  'B00BWYRF7E', 'B00D2KJDXA']
         products = self.amazon.lookup(ItemId=','.join(asins))
         assert_equals(len(products), len(asins))
@@ -157,34 +157,9 @@ def test_search_no_results(self):
         Tests that a product search with that returns no results throws a
         SearchException.
         """
-        products = self.amazon.search(Title='HarryPotter',
+        products = self.amazon.search(Title='no-such-thing-on-amazon',
                                       SearchIndex='Automotive')
-        self.assertRaises(SearchException, (x for x in products).next)
-
-    @mock.patch('amazon.api.objectify')
-    def test_search_throttled(self, lxml):
-        """Test handling of a search throttled by Amazon.
-
-        Tests that a product search that triggers throttling by Amazon:
-        http://docs.aws.amazon.com/AWSECommerceService/latest/DG/ErrorNumbers.html
-        """
-
-        lxml.return_value = {
-            "Items": {
-                "Request": {
-                    "Errors": {
-                        "Error": {
-                            "Code": "AWS.ParameterOutOfRange",
-                            "Message": "Request has been throttled"
-                        }
-                    }
-                }
-            }
-        }
-
-        AmazonSearch._query()
-
-
+        assert_raises(SearchException, (x for x in products).next)
 
     def test_amazon_api_defaults_to_US(self):
         """Test Amazon API defaults to the US store."""
@@ -261,7 +236,7 @@ def test_single_creator(self):
         product = self.amazon.lookup(ItemId="B00005NZJA")
         creators = dict(product.creators)
         assert_equals(creators[u"Jonathan Davis"], u"Narrator")
-        assert_equals(len(creators.values()), 1)
+        assert_equals(len(creators.values()), 2)
 
     def test_multiple_creators(self):
         """Test a product with multiple creators
@@ -358,18 +333,17 @@ def setUp(self):
         )
 
     def test_cart_clear_required_params(self):
-        self.assertRaises(CartException, self.amazon.cart_clear, None, None)
-        self.assertRaises(CartException, self.amazon.cart_clear, 'NotNone',
-                          None)
-        self.assertRaises(CartException, self.amazon.cart_clear, None,
-                          'NotNone')
+        assert_raises(CartException, self.amazon.cart_clear, None, None)
+        assert_raises(CartException, self.amazon.cart_clear, 'NotNone',
+                      None)
+        assert_raises(CartException, self.amazon.cart_clear, None,
+                      NotNone')
 
     def build_cart_object(self):
         product = self.amazon.lookup(ItemId="B0016J8AOC")
         return self.amazon.cart_create(
             {
-                'offer_id': product._safe_get_element(
-                    'Offers.Offer.OfferListing.OfferListingId'),
+                'offer_id': product.offer_id,
                 'quantity': 1
             }
         )
@@ -380,7 +354,7 @@ def test_cart_create_single_item(self):
 
     def test_cart_create_multiple_item(self):
         product1 = self.amazon.lookup(ItemId="B0016J8AOC")
-        product2 = self.amazon.lookup(ItemId="B007HCCNJU")
+        product2 = self.amazon.lookup(ItemId=TEST_ASIN)
         asins = [product1.asin, product2.asin]
 
         cart = self.amazon.cart_create([
@@ -409,8 +383,8 @@ def test_cart_clear_wrong_hmac(self):
         # never use urlencoded hmac, as library encodes as well. Just in case
         # hmac = url_encoded_hmac we add some noise
         hmac = cart.url_encoded_hmac + '%3d'
-        self.assertRaises(CartInfoMismatchException, self.amazon.cart_clear,
-                          cart.cart_id, hmac)
+        assert_raises(CartInfoMismatchException, self.amazon.cart_clear,
+                      cart.cart_id, hmac)
 
     def test_cart_attributes(self):
         cart = self.build_cart_object()
@@ -438,12 +412,12 @@ def test_cart_get_wrong_hmac(self):
         # not been used in test_cart_clear
         cache_clear()
         cart = self.build_cart_object()
-        self.assertRaises(CartInfoMismatchException, self.amazon.cart_get,
-                          cart.cart_id, cart.hmac + '%3d')
+        assert_raises(CartInfoMismatchException, self.amazon.cart_get,
+                      cart.cart_id, cart.hmac + '%3d')
 
     def test_cart_add(self):
         cart = self.build_cart_object()
-        product = self.amazon.lookup(ItemId="B007HCCNJU")
+        product = self.amazon.lookup(ItemId=TEST_ASIN)
         item = {
             'offer_id': product._safe_get_element(
                 'Offers.Offer.OfferListing.OfferListingId'),
@@ -468,7 +442,7 @@ def test_cart_delete(self):
             cart_item_id = item.cart_item_id
         item = {'cart_item_id': cart_item_id, 'quantity': 0}
         new_cart = self.amazon.cart_modify(item, cart.cart_id, cart.hmac)
-        self.assertRaises(KeyError, new_cart.__getitem__, cart_item_id)
+        assert_raises(KeyError, new_cart.__getitem__, cart_item_id)
 
 if __name__ == '__main__':
     unittest.main()