summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2022-01-14 11:49:41 +0000
committerwiz <wiz@pkgsrc.org>2022-01-14 11:49:41 +0000
commitb461ebc61eb28fe69cd1e993ac58e3c1757c7e47 (patch)
tree9805ebfe34408e9981eebfdd2ad617857f732131 /comms
parent71023e16e9c60a858d647271160d66c2cc71b386 (diff)
downloadpkgsrc-b461ebc61eb28fe69cd1e993ac58e3c1757c7e47.tar.gz
*: remove workaround patches for python 3.6
Diffstat (limited to 'comms')
-rw-r--r--comms/py-colorama/distinfo3
-rw-r--r--comms/py-colorama/patches/patch-setup.py34
2 files changed, 1 insertions, 36 deletions
diff --git a/comms/py-colorama/distinfo b/comms/py-colorama/distinfo
index 5144d8c1703..e63d50e547c 100644
--- a/comms/py-colorama/distinfo
+++ b/comms/py-colorama/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:06:04 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/01/14 11:49:41 wiz Exp $
BLAKE2s (colorama-0.4.4.tar.gz) = a55a983f46c9c8d0a9e487dccc28dc30fd787a53f8cb7452c4ea59025c88a7e0
SHA512 (colorama-0.4.4.tar.gz) = 84db73bed5a6d4ab1624bdbeea65aef2061126e730f9d4a853f3b2504b9ebf5eb7c0649024ec687b538a89c20c83a5f3365d4fb1aba9fdba3db0b375942c48f4
Size (colorama-0.4.4.tar.gz) = 27813 bytes
-SHA1 (patch-setup.py) = aba7883e6c6c2514e70d0e0e12417186bc01f1a3
diff --git a/comms/py-colorama/patches/patch-setup.py b/comms/py-colorama/patches/patch-setup.py
deleted file mode 100644
index 9cf2f7f24d4..00000000000
--- a/comms/py-colorama/patches/patch-setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2021/01/09 00:43:43 mef Exp $
-
-This patch is necessary only for python-3.6
-
-Traceback (most recent call last):
- File "setup.py", line 36, in <module>
- long_description=read_file('README.rst'),
- File "setup.py", line 19, in read_file
- return fp.read()
- File "/usr/pkg/lib/python3.6/encodings/ascii.py", line 26, in decode
- return codecs.ascii_decode(input, self.errors)[0]
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 852: ordinal not in range(128)
-*** Error code 1
-
---- setup.py.orig 2020-10-13 06:22:32.000000000 +0900
-+++ setup.py 2021-01-09 09:24:27.258231596 +0900
-@@ -5,6 +5,8 @@ from __future__ import with_statement
-
- import os
- import re
-+import sys
-+
- try:
- from setuptools import setup
- except ImportError:
-@@ -15,7 +17,7 @@ NAME = 'colorama'
-
-
- def read_file(path):
-- with open(os.path.join(os.path.dirname(__file__), path)) as fp:
-+ with open(os.path.join(os.path.dirname(__file__), path), **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as fp:
- return fp.read()
-
- def _get_version_match(content):