git: 304f03261904 - main - devel/py-xmltodict: Revert a8a9acded3d7517512bc62b929401e6cc73ad118 and ce16fa339263309c4baf66317e6f9ac802a71e21

[Po-Chuan Hsieh]

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=304f03261904638a7b3aed03051cafddc8870f60

commit 304f03261904638a7b3aed03051cafddc8870f60
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-05-30 19:52:29 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-05-30 19:52:29 +0000

    devel/py-xmltodict: Revert a8a9acded3d7517512bc62b929401e6cc73ad118 and ce16fa339263309c4baf66317e6f9ac802a71e21
---
 devel/py-xmltodict/Makefile             |  1 +
 devel/py-xmltodict/files/patch-setup.py | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/devel/py-xmltodict/Makefile b/devel/py-xmltodict/Makefile
index 4bbd645f6f61..572ab2ddea0d 100644
--- a/devel/py-xmltodict/Makefile
+++ b/devel/py-xmltodict/Makefile
@@ -18,6 +18,7 @@ USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
+USE_LOCALE=	en_US.UTF-8 # Python 3.6
 
 do-test:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests-${PYTHON_VER}
diff --git a/devel/py-xmltodict/files/patch-setup.py b/devel/py-xmltodict/files/patch-setup.py
deleted file mode 100644
index 416bb1f917c4..000000000000
--- a/devel/py-xmltodict/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- setup.py.orig	2019-02-11 06:36:33 UTC
-+++ setup.py
-@@ -8,8 +8,8 @@ except ImportError:
- 
- import xmltodict
- 
--with open('README.md') as f:
--    long_description = f.read()
-+with open('README.md', 'rb') as f:
-+    long_description = f.read().decode('utf-8')
- 
- 
- setup(name='xmltodict',