Amir py3 future fixes (#5)

* Keeping bytes as bytes. str(b'horrifying') gives 'b\'horrifying\'' results
* python3 got no iteritems()

Author: Amir-Hadadi

mockredis/client.py

@@ -1091,7 +1091,7 @@ def sunionstore(self, dest, keys, *args):
     def zadd(self, name, mappings):
         zset = self._get_zset(name, "ZADD", create=True)
         insert_count = lambda member, score: 1 if zset.insert(self._encode(member), float(score)) else 0  # noqa
-        return sum((insert_count(member, score) for member, score in mappings.iteritems()))
+        return sum((insert_count(member, score) for member, score in list(mappings.items())))
 
     def zcard(self, name):
         zset = self._get_zset(name, "ZCARD")
@@ -1533,7 +1533,7 @@ def _score_inclusive(self, score):
     def _encode(self, value):
         "Return a bytestring representation of the value. Originally taken from redis-py connection.py"
         if isinstance(value, (newbytes, bytes)):
-            return str(value)
+            value = value
         elif isinstance(value, (int, long)):
             value = str(value).encode('utf-8')
         elif isinstance(value, float):
@@ -1543,10 +1543,7 @@ def _encode(self, value):
         else:
             value = value.encode('utf-8', 'strict')
 
-        if isinstance(value, bytes):
-            value = value.decode('utf-8', 'strict')
-
-        return value
+        return value.decode('utf-8', 'strict')
 
     def _log(self, level, msg):
         pass

mockredis/script.py

@@ -190,7 +190,7 @@ def _python_to_lua(pval):
             #     in Lua returns: {k1, v1, k2, v2, k3, v3}
             lua_dict = lua.eval("{}")
             lua_table = lua.eval("table")
-            for k, v in pval.iteritems():
+            for k, v in list(pval.items()):
                 lua_table.insert(lua_dict, Script._python_to_lua(k))
                 lua_table.insert(lua_dict, Script._python_to_lua(v))
             return lua_dict