- From c0368f526c3d84a149aed5fad179098138b06f66 Mon Sep 17 00:00:00 2001

- From: David King <amigadave@amigadave.com>

- Date: Mon, 14 Dec 2015 09:58:19 +0000

- Subject: [PATCH] Fix test_too_many_fields with Python 3.5

- 

- Python versions before 3.5 had a limit of 100 groups in regular

- expressions. This limit was removed during 3.5 development:

- 

- http://bugs.python.org/issue22437

- https://hg.python.org/cpython/rev/0b85ea4bd1af

- 

- The test_too_many_fields test asserts that the limit exists by

- attempting to parse a string with 15 fields, which triggers the 100

- named groups limit.

- 

- Adjust the test so that if first checks to see whether the limit of 100

- named groups exists, and only assert that parsing 15 fields fails if

- that is the case.

- ---

-  test_parse.py | 10 ++++++++--

-  1 file changed, 8 insertions(+), 2 deletions(-)

- 

- diff --git a/test_parse.py b/test_parse.py

- index c524349..1d50568 100755

- --- a/test_parse.py

- +++ b/test_parse.py

- @@ -6,6 +6,7 @@ See the end of the source file for the license of use.

- 

-  import unittest

-  from datetime import datetime, time

- +import re

- 

-  import parse

- 

- @@ -624,8 +625,13 @@ class TestParse(unittest.TestCase):

-          self.assertEqual(r.fixed[21], 'spam')

- 

-      def test_too_many_fields(self):

- -        p = parse.compile('{:ti}' * 15)

- -        self.assertRaises(parse.TooManyFields, p.parse, '')

- +        # Python 3.5 removed the limit of 100 named groups in a regular expression,

- +        # so only test for the exception if the limit exists.

- +        try:

- +            re.compile("".join("(?P<n{n}>{n}-)".format(n=i) for i in range(101)))

- +        except AssertionError:

- +            p = parse.compile('{:ti}' * 15)

- +            self.assertRaises(parse.TooManyFields, p.parse, '')

- 

- 

-  class TestSearch(unittest.TestCase):

- --

- 2.6.4

- 

- %if 0%{?rhel} > 7 || 0%{?fedora} >= 12

- %bcond_without python3

- %bcond_with python3

- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from %distutils.sysconfig import get_python_lib; print(get_python_lib())")}

- Name:               python-parse

- Version:            1.6.4

- Release:            4%{?dist}

- Summary:            Opposite of format()

- 

- Group:              Development/Libraries

- License:            BSD

- URL:                http://pypi.python.org/pypi/parse

- Source0:            http://pypi.python.org/packages/source/p/%{modname}/%{modname}-%{version}.tar.gz

- # https://bugzilla.redhat.com/show_bug.cgi?id=1291218

- Patch0:             parse-python-3.5-test.patch

- 

- BuildArch:          noarch

- BuildRequires:      python2-devel

- BuildRequires:      python-setuptools

- %if %{with python3}

- BuildRequires:      python3-devel

- BuildRequires:      python3-setuptools

- %endif

- %description

- Parse strings using a specification based on the Python format() syntax.

- ``parse()`` is the opposite of ``format()``

- %if %{with python3}

- %package -n python3-%{modname}

- Summary:        Opposite of format()

- Group:          Development/Libraries

- %description -n python3-%{modname}

- Parse strings using a specification based on the Python format() syntax.

- ``parse()`` is the opposite of ``format()``

- This package works with Python 3.

- %prep

- %setup -q -n %{modname}-%{version}

- %patch0 -p1

- 

- # Remove bundled egg-info in case it exists

- rm -rf %{modname}.egg-info

- %if %{with python3}

- rm -rf %{py3dir}

- cp -a . %{py3dir}

- find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'

- %{__python} setup.py build

- %if %{with python3}

- pushd %{py3dir}

- %{__python3} setup.py build

- popd

- %endif

- %install

- # Must do the python3 install first because the scripts in /usr/bin are

- # overwritten with every setup.py install (and we want the python2

- # version to be the default for now).

- pushd %{py3dir}

- %{__python3} setup.py install --skip-build --root=%{buildroot}

- popd

- %{__python} setup.py install -O1 --skip-build --root=%{buildroot}

- %check

- %{__python} test_parse.py

- %if %{with python3}

- pushd %{py3dir}

- %{__python3} test_parse.py

- popd

- %endif

- %files

- %doc README.rst

- %{python_sitelib}/%{modname}*

- %if %{with python3}

- %files -n python3-%{modname}

- %doc README.rst

- %{python3_sitelib}/%{modname}*

- %{python3_sitelib}/__pycache__/%{modname}*

- %endif

- %changelog

- 87bfd55c25d1aea2d7499197254f3a6f  parse-1.6.4.tar.gz