aboutsummaryrefslogtreecommitdiff
path: root/frozen_deps/Cryptodome/Util/py3compat.py
diff options
context:
space:
mode:
Diffstat (limited to 'frozen_deps/Cryptodome/Util/py3compat.py')
-rw-r--r--frozen_deps/Cryptodome/Util/py3compat.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/frozen_deps/Cryptodome/Util/py3compat.py b/frozen_deps/Cryptodome/Util/py3compat.py
index 9a982e9..3294b66 100644
--- a/frozen_deps/Cryptodome/Util/py3compat.py
+++ b/frozen_deps/Cryptodome/Util/py3compat.py
@@ -87,6 +87,14 @@ if sys.version_info[0] == 2:
def byte_string(s):
return isinstance(s, str)
+ # In Python 2, a memoryview does not support concatenation
+ def concat_buffers(a, b):
+ if isinstance(a, memoryview):
+ a = a.tobytes()
+ if isinstance(b, memoryview):
+ b = b.tobytes()
+ return a + b
+
from StringIO import StringIO
BytesIO = StringIO
@@ -137,6 +145,9 @@ else:
def byte_string(s):
return isinstance(s, bytes)
+ def concat_buffers(a, b):
+ return a + b
+
from io import BytesIO
from io import StringIO
from sys import maxsize as maxint