Merge branch 'ddb2-fix-has-item' into develop

Fixes #2090.

boto/dynamodb2/exceptions.py

@@ -72,3 +72,7 @@ class UnknownFilterTypeError(DynamoDBError):
 
 class QueryError(DynamoDBError):
     pass
+
+
+class ItemNotFound(DynamoDBError):
+    pass

boto/dynamodb2/table.py

@@ -488,6 +488,8 @@ def get_item(self, consistent=False, attributes=None, **kwargs):
             attributes_to_get=attributes,
             consistent_read=consistent
         )
+        if 'Item' not in item_data:
+            raise exceptions.ItemNotFound("Item %s couldn't be found." % kwargs)
         item = Item(self)
         item.load(item_data)
         return item
@@ -526,7 +528,7 @@ def has_item(self, **kwargs):
         """
         try:
             self.get_item(**kwargs)
-        except JSONResponseError:
+        except (JSONResponseError, exceptions.ItemNotFound):
             return False
 
         return True

tests/integration/dynamodb2/test_highlevel.py

@@ -109,6 +109,14 @@ def test_integration(self):
 
         time.sleep(5)
 
+        # Does it exist? It should?
+        self.assertTrue(users.has_item(username='jane', friend_count=3))
+        # But this shouldn't be there...
+        self.assertFalse(users.has_item(
+            username='mrcarmichaeljones',
+            friend_count=72948
+        ))
+
         # Test getting an item & updating it.
         # This is the "safe" variant (only write if there have been no
         # changes).