Merge lp:~facundo/ubuntu-rest-scopes/fix-ebay-noconditiondisplayname into lp:ubuntu-rest-scopes

[Facundo Batista]

Support the case of no condition or condition not complete in the search response.

Support the case of no condition or condition not complete in the search response.Support the case of no condition or condition not complete in the search response.

[Roberto Alsina (ralsina)]

LGTM

review: Approve

=== modified file 'src/scopes/ebay.py'
--- src/scopes/ebay.py	2016-05-30 12:22:13 +0000
+++ src/scopes/ebay.py	2016-06-07 14:28:03 +0000
@@ -167,9 +167,9 @@
         res['image_hint'] = res['icon_hint']
     res['title'] = item['title'][0]
     res['uri'] = item['viewItemURL'][0]
-    if 'condition' in item:
+    try:
         res['condition'] = item['condition'][0]['conditionDisplayName'][0]
-    else:
+    except KeyError:
         res['condition'] = None
     res['shipping_to'] = ', '.join(item[
         'shippingInfo'][0]['shipToLocations'])

=== added file 'src/scopes/tests/fixtures/ebay-searcheditem-nocondition.json'
--- src/scopes/tests/fixtures/ebay-searcheditem-nocondition.json	1970-01-01 00:00:00 +0000
+++ src/scopes/tests/fixtures/ebay-searcheditem-nocondition.json	2016-06-07 14:28:03 +0000
@@ -0,0 +1,1 @@
+{"itemId": ["151395385200"], "topRatedListing": ["false"], "globalId": ["EBAY-GB"], "title": ["Conan the Swordsman (L Sprague de Camp, L Carter, B Nyberg, Paperback)"], "country": ["GB"], "condition": [{"conditionId": ["4000"]}], "pictureURLLarge": ["http://i.ebayimg.com/00/s/MTIwMFgxNjAw/z/hKoAAOSwd4tT1oHb/$_1.JPG"], "galleryURL": ["http://thumbs1.ebaystatic.com/m/mWruVLT7AcyBb5Rmei3myZg/140.jpg"], "shippingInfo": [{"shippingType": ["Flat"], "shipToLocations": ["GB"], "shippingServiceCost": [{"@currencyId": "GBP", "__value__": "1.3"}]}], "autoPay": ["false"], "location": ["Stoke-on-Trent,United Kingdom"], "postalCode": ["ST78LP"], "primaryCategory": [{"categoryId": ["377"], "categoryName": ["Other Fiction"]}], "viewItemURL": ["http://www.ebay.co.uk/itm/Conan-Swordsman-L-Sprague-Camp-L-Carter-B-Nyberg-Paperback-/151395385200?pt=Fiction"], "sellingStatus": [{"currentPrice": [{"@currencyId": "GBP", "__value__": "0.99"}], "timeLeft": ["P2DT22H0M16S"], "convertedCurrentPrice": [{"@currencyId": "GBP", "__value__": "0.99"}], "bidCount": ["0"], "sellingState": ["Active"]}], "paymentMethod": ["PayPal"], "isMultiVariationListing": ["false"], "pictureURLSuperSize": ["http://i.ebayimg.com/00/s/MTIwMFgxNjAw/z/hKoAAOSwd4tT1oHb/$_3.JPG"], "listingInfo": [{"listingType": ["Auction"], "gift": ["false"], "bestOfferEnabled": ["false"], "startTime": ["2014-08-28T22:39:00.000Z"], "buyItNowAvailable": ["false"], "endTime": ["2014-09-04T10:38:55.000Z"]}]}

=== modified file 'src/scopes/tests/test_ebay.py'
--- src/scopes/tests/test_ebay.py	2016-05-30 12:22:13 +0000
+++ src/scopes/tests/test_ebay.py	2016-06-07 14:28:03 +0000
@@ -826,3 +826,8 @@
         item = json.loads(get_fixture('ebay-searcheditem-nopayment.json'))
         resp = ebay._parse_searched_item(item, 'en')
         self.assertEqual(resp['payment_method'], None)
+
+    def test_searched_no_condition(self):
+        item = json.loads(get_fixture('ebay-searcheditem-nocondition.json'))
+        resp = ebay._parse_searched_item(item, 'en')
+        self.assertEqual(resp['condition'], None)