Compare commits

3 Commits

5 changed files with 87 additions and 65 deletions

80
no-six.patch Normal file
View File

@@ -0,0 +1,80 @@
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ÅåΔ_ΦΓΛΩΠΨΣΘΞÆæßÉ" \

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0fd4a9ff4aa658d0d9ab0baaf43c24bf555e3b2f5c8710bda011cbb02195354
size 7790

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b5c3af73db750a19754f1d573b5e0ee8dafba35540070941cdaa45faf05e55f
size 16065

View File

@@ -1,62 +1,3 @@
-------------------------------------------------------------------
Thu Nov 27 15:44:06 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 1.1.0
* Document parameter and return types
* fix formatting according flake8
* add python 3.6 to test matrix
* ignore .pytest_cache
* use unicodedata python standard module to replace unicode.py
* update referece to latest TS 23.038 standard
* cleanup module public interface
* remove *.txt from package_data
* remove dependency to module six
* add badges for PyPI and license
* fix PyPI batch
* add passenv to tox configuration to support codecov.io
* use codecov python script
* use Codec Error Handling Callbacks as described in PEP 293
* bump version to 1.1.0
* remove support for deprecated Python version 3.3
* remove travis build for deprecated Python version 3.3
* move input length calculation out of loop
* format file according PEP8
* collect coverage data
* add space
* move requirement pytest-cov from tox.ini into .travis.yml
* use explicite list of deps in tox.ini
* tox.ini deps update
* cleanup setup, travis and tox configuration
* fix type in codecov badge path
* cleanup code registry
* properly handle str and bytes replacement
* Test and indicate support of Python 3.7
* test_charset: Escape \
* Test and indicate support of Python 3.7
* test_charset: Escape \
* add normalization example
* update .gitignore to latest template from github
* add Python 3.8 to CI build and drop testing for EOL Python 3.4
* update CI configuration to a modern setup
* add note about unsupported character packing
* Remove support for Python 2.7
* Fix flake8 rules
* update check-manifest configuration
* switch to travis-ci.com
* replace setup.py with pyproject.toml
* create Github workflow for CI (#12)
* cleanup project
* add basic pre-commit configuration (#13)
* drop support for Python 3.6 (#14)
* [pre-commit.ci] pre-commit autoupdate (#15)
* [pre-commit.ci] pre-commit autoupdate (#16)
* [pre-commit.ci] pre-commit autoupdate (#17)
* bump supported Python versions
* [pre-commit.ci] pre-commit autoupdate
* remove travis.ci batch from readme
- Drop no-six.patch, merged upstream
- Use Python 3.11 on SLE-15 by default
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 27 15:03:09 UTC 2025 - Markéta Machová <mmachova@suse.com> Tue May 27 15:03:09 UTC 2025 - Markéta Machová <mmachova@suse.com>

View File

@@ -16,16 +16,17 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%{?sle15_python_module_pythons}
Name: python-gsm0338 Name: python-gsm0338
Version: 1.1.0 Version: 1.0.0
Release: 0 Release: 0
Summary: Python Codec for 3GPP TS 23.038 / ETSI GSM 03.38 Summary: Python Codec for 3GPP TS 23.038 / ETSI GSM 03.38
License: MIT License: MIT
URL: https://github.com/dsch/gsm0338 URL: https://github.com/dsch/gsm0338
#GIT-Clone: https://github.com/dsch/gsm0338.git #GIT-Clone: https://github.com/dsch/gsm0338.git
Source: https://github.com/dsch/gsm0338/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source: https://github.com/dsch/gsm0338/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: %{python_module poetry-core >= 1.0.0} # PATCH-FIX-UPSTREAM parts of https://github.com/dsch/gsm0338/commit/94bcadca630d498ce8b33295c617acb1a75b39da Remove support for Python 2.7
Patch: no-six.patch
BuildRequires: %{python_module pip} BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel} BuildRequires: %{python_module wheel}