forked from pool/python-gsm0338
Nico Krapp
3ba8b65487
- Add no-six.patch to remove the dependency on six OBS-URL: https://build.opensuse.org/request/show/1280648 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gsm0338?expand=0&rev=6
81 lines
2.7 KiB
Diff
81 lines
2.7 KiB
Diff
Index: gsm0338-1.0.0/gsm0338/codec.py
|
|
===================================================================
|
|
--- gsm0338-1.0.0.orig/gsm0338/codec.py
|
|
+++ gsm0338-1.0.0/gsm0338/codec.py
|
|
@@ -1,5 +1,4 @@
|
|
import codecs
|
|
-from six import byte2int, int2byte, unichr
|
|
from .charset import BASIC_CHARACTER_SET, BASIC_CHARACTER_SET_EXTENSION
|
|
|
|
# Codec APIs
|
|
@@ -50,8 +49,8 @@ class Codec(codecs.Codec):
|
|
(self.NAME, character, consumed - 1))
|
|
if num is not None:
|
|
if num & 0xff00:
|
|
- encode_buffer += int2byte(self._ESCAPE)
|
|
- encode_buffer += int2byte(num & 0xff)
|
|
+ encode_buffer += bytes((self._ESCAPE,))
|
|
+ encode_buffer += bytes((num & 0xff,))
|
|
return encode_buffer, consumed
|
|
|
|
def decode(self, input, errors='strict'):
|
|
@@ -67,12 +66,12 @@ class Codec(codecs.Codec):
|
|
num = 0
|
|
for value in input:
|
|
consumed += 1
|
|
- num |= byte2int([value])
|
|
+ num |= [value][0]
|
|
if num == self._ESCAPE:
|
|
num <<= 8
|
|
continue
|
|
try:
|
|
- decode_buffer += unichr(self._decode_map[num])
|
|
+ decode_buffer += chr(self._decode_map[num])
|
|
except KeyError as ex:
|
|
if errors == 'replace':
|
|
decode_buffer += u'\ufffd'
|
|
Index: gsm0338-1.0.0/requirements.txt
|
|
===================================================================
|
|
--- gsm0338-1.0.0.orig/requirements.txt
|
|
+++ gsm0338-1.0.0/requirements.txt
|
|
@@ -1,3 +1,2 @@
|
|
-six
|
|
pytest
|
|
pytest-flake8
|
|
Index: gsm0338-1.0.0/setup.py
|
|
===================================================================
|
|
--- gsm0338-1.0.0.orig/setup.py
|
|
+++ gsm0338-1.0.0/setup.py
|
|
@@ -34,7 +34,7 @@ setup(
|
|
long_description=long_description,
|
|
|
|
packages=find_packages(),
|
|
- install_requires=['six'],
|
|
+ install_requires=[],
|
|
package_data={
|
|
'': ['*.txt', '*.rst'],
|
|
},
|
|
Index: gsm0338-1.0.0/test/test_codec.py
|
|
===================================================================
|
|
--- gsm0338-1.0.0.orig/test/test_codec.py
|
|
+++ gsm0338-1.0.0/test/test_codec.py
|
|
@@ -2,7 +2,6 @@
|
|
|
|
import gsm0338
|
|
import pytest
|
|
-from six import int2byte
|
|
|
|
|
|
@pytest.fixture
|
|
@@ -10,8 +9,8 @@ def codec():
|
|
return gsm0338.Codec()
|
|
|
|
|
|
-GSM_BASIC_CHARACTER_SET = b"".join([int2byte(x) for x in range(27)]) +\
|
|
- b"".join([int2byte(x) for x in range(28, 128)]) +\
|
|
+GSM_BASIC_CHARACTER_SET = b"".join([bytes(range(27))]) +\
|
|
+ b"".join([bytes(range(28, 128))]) +\
|
|
b"\x1B\x0A\x1B\x14\x1B\x28\x1B\x29\x1B\x2F"\
|
|
b"\x1B\x3C\x1B\x3D\x1B\x3E\x1B\x40\x1B\x65"
|
|
UNICODE_BASIC_CHARACTER_SET = u"@£$¥èéùìòÇ\nØø\rÅåΔ_ΦΓΛΩΠΨΣΘΞÆæßÉ" \
|