Merge branch 'master' of https://github.com/maxnoel/boto into maxnoel…

…-master
krux · Mar 20, 2012 · 0709e2d · 0709e2d
2 parents 2d88202 + 5b05adc
commit 0709e2d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/boto/dynamodb/item.py b/boto/dynamodb/item.py
@@ -40,13 +40,15 @@ def __init__(self, table, hash_key=None, range_key=None, attrs=None):
         self._updates = None
         self._hash_key_name = self.table.schema.hash_key_name
         self._range_key_name = self.table.schema.range_key_name
-        hash_key = hash_key or attrs.get(self._hash_key_name, None)
         if hash_key is None:
-            raise DynamoDBItemError('You must supply a hash_key')
+            if attrs.get(self._hash_key_name) is None:
+                raise DynamoDBItemError('You must supply a hash_key')
+            hash_key = attrs[self._hash_key_name]
         if self._range_key_name:
-            range_key = range_key or attrs.get(self._range_key_name, None)
             if range_key is None:
-                raise DynamoDBItemError('You must supply a range_key')
+                if attrs.get(self._range_key_name) is None:
+                    raise DynamoDBItemError('You must supply a range_key')
+                range_key = attrs[self._range_key_name]
         self[self._hash_key_name] = hash_key
         if self._range_key_name:
             self[self._range_key_name] = range_key