Merge pull request aio-libs-abandoned#658 from dmvass/bugfix/657

Fix transaction data decoding

CHANGES/657.bugfix

@@ -0,0 +1 @@
+Fix transaction data decoding

CONTRIBUTORS.txt

@@ -47,3 +47,4 @@ Volodymyr Hotsyk
 Youngmin Koo <youngminz>
 Dima Kit
 <curiouscod3>
+Dmitry Vasilishin <dmvass>

aioredis/connection.py

@@ -339,6 +339,7 @@ def execute(self, command, *args, encoding=_NOTSET):
             cb = self._start_transaction
         elif command in ('EXEC', b'EXEC'):
             cb = partial(self._end_transaction, discard=False)
+            encoding = None
         elif command in ('DISCARD', b'DISCARD'):
             cb = partial(self._end_transaction, discard=True)
         else:

tests/transaction_commands_test.py

@@ -201,13 +201,16 @@ async def test_global_encoding(redis, create_redis, server):
     tr = redis.multi_exec()
     fut1 = tr.get('key')
     fut2 = tr.get('key', encoding='utf-8')
-    fut3 = tr.hgetall('hash-key', encoding='utf-8')
+    fut3 = tr.get('key', encoding=None)
+    fut4 = tr.hgetall('hash-key', encoding='utf-8')
     await tr.execute()
     res = await fut1
     assert res == 'value'
     res = await fut2
     assert res == 'value'
     res = await fut3
+    assert res == b'value'
+    res = await fut4
     assert res == {'foo': 'val1', 'bar': 'val2'}