14
0

- Add stdout-encoding-set.patch to use sys.stdout.reconfigure() for Python 3.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sqlparse?expand=0&rev=19
This commit is contained in:
2020-03-23 06:36:48 +00:00
committed by Git OBS Bridge
parent 46ded828ef
commit 85757991a1
3 changed files with 59 additions and 0 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 23 06:35:19 UTC 2020 - Steve Kowalik <steven.kowalik@suse.com>
- Add stdout-encoding-set.patch to use sys.stdout.reconfigure() for Python 3.
-------------------------------------------------------------------
Mon Mar 9 16:22:39 UTC 2020 - Dirk Mueller <dmueller@suse.com>

View File

@@ -25,6 +25,7 @@ License: BSD-3-Clause
Group: Development/Languages/Python
URL: https://github.com/andialbrecht/sqlparse
Source: https://files.pythonhosted.org/packages/source/s/sqlparse/sqlparse-%{version}.tar.gz
Patch0: stdout-encoding-set.patch
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -42,6 +43,7 @@ parsing, splitting and formatting SQL statements.
%prep
%setup -q -n sqlparse-%{version}
sed -i -e '1{\,^#!%{_bindir}/env python,d}' sqlparse/__main__.py sqlparse/cli.py
%autopatch -p1
%build
%python_build

52
stdout-encoding-set.patch Normal file
View File

@@ -0,0 +1,52 @@
Index: sqlparse-0.3.1/tests/test_cli.py
===================================================================
--- sqlparse-0.3.1.orig/tests/test_cli.py
+++ sqlparse-0.3.1/tests/test_cli.py
@@ -78,7 +78,10 @@ def test_script():
def test_encoding_utf8_stdout(filepath, load_file, capfd):
path = filepath('encoding_utf8.sql')
expected = load_file('encoding_utf8.sql', 'utf-8')
- sys.stdout.encoding = 'utf-8'
+ if sys.hexversion >= 0x3070000:
+ sys.stdout.reconfigure(encoding='utf-8')
+ else:
+ sys.stdout.encoding = 'utf-8'
sqlparse.cli.main([path])
out, _ = capfd.readouterr()
assert out == expected
@@ -96,7 +99,10 @@ def test_encoding_utf8_output_file(filep
def test_encoding_gbk_stdout(filepath, load_file, capfd):
path = filepath('encoding_gbk.sql')
expected = load_file('encoding_gbk.sql', 'gbk')
- sys.stdout.encoding = 'gbk'
+ if sys.hexversion >= 0x3070000:
+ sys.stdout.reconfigure(encoding='gbk')
+ else:
+ sys.stdout.encoding = 'gbk'
sqlparse.cli.main([path, '--encoding', 'gbk'])
out, _ = capfd.readouterr()
assert out == expected
@@ -117,7 +123,10 @@ def test_encoding_stdin_utf8(filepath, l
old_stdin = sys.stdin
with open(path, 'r') as f:
sys.stdin = f
- sys.stdout.encoding = 'utf-8'
+ if sys.hexversion >= 0x3070000:
+ sys.stdout.reconfigure(encoding='utf-8')
+ else:
+ sys.stdout.encoding = 'utf-8'
sqlparse.cli.main(['-'])
sys.stdin = old_stdin
out, _ = capfd.readouterr()
@@ -130,7 +139,10 @@ def test_encoding_stdin_gbk(filepath, lo
old_stdin = sys.stdin
with open(path, 'r') as stream:
sys.stdin = stream
- sys.stdout.encoding = 'gbk'
+ if sys.hexversion >= 0x3070000:
+ sys.stdout.reconfigure(encoding='gbk')
+ else:
+ sys.stdout.encoding = 'gbk'
sqlparse.cli.main(['-', '--encoding', 'gbk'])
sys.stdin = old_stdin
out, _ = capfd.readouterr()