Merge in fix for Issue #75

Conflicts:
	mockredis/client.py
	mockredis/tests/test_hash.py

Author: Jesse Myers

mockredis/client.py

@@ -211,6 +211,7 @@ def pttl(self, key):
             return long(-2) if self.strict else None
         if key not in self.timeouts:
             # as of redis 2.8, -1 is returned if the key is persistent
+            # redis-py returns None; command docs say -1
             return long(-1) if self.strict else None
 
         time_to_live = get_total_milliseconds(self.timeouts[key] - self.clock.now())
@@ -472,20 +473,20 @@ def hset(self, hashkey, attribute, value):
 
         redis_hash = self._get_hash(hashkey, 'HSET', create=True)
         attribute = self._encode(attribute)
-        was_present = attribute in redis_hash
+        attribute_present = attribute in redis_hash
         redis_hash[attribute] = self._encode(value)
-        return 0 if was_present else 1
+        return long(0) if attribute_present else long(1)
 
     def hsetnx(self, hashkey, attribute, value):
         """Emulate hsetnx."""
 
         redis_hash = self._get_hash(hashkey, 'HSETNX', create=True)
         attribute = self._encode(attribute)
         if attribute in redis_hash:
-            return 0
+            return long(0)
         else:
             redis_hash[attribute] = self._encode(value)
-            return 1
+            return long(1)
 
     def hincrby(self, hashkey, attribute, increment=1):
         """Emulate hincrby."""

mockredis/tests/test_hash.py

@@ -52,7 +52,7 @@ def test_hget(self):
 
     def test_hset_integral(self):
         hashkey = "hash"
-        self.redis.hset(hashkey, 1, 2)
+        eq_(1, self.redis.hset(hashkey, 1, 2))
         eq_(b"2", self.redis.hget(hashkey, 1))
         eq_(b"2", self.redis.hget(hashkey, "1"))