forked from pool/python-parse_type
Matej Cepl
3736402be4
- Add python3-fixes.patch to make tests pass. OBS-URL: https://build.opensuse.org/request/show/674603 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-parse_type?expand=0&rev=1
125 lines
3.5 KiB
Diff
125 lines
3.5 KiB
Diff
--- a/parse_type/parse_util.py
|
|
+++ b/parse_type/parse_util.py
|
|
@@ -6,7 +6,7 @@ Provides generic utility classes for the
|
|
|
|
from __future__ import absolute_import
|
|
from collections import namedtuple
|
|
-import parse
|
|
+from . import parse
|
|
import six
|
|
|
|
|
|
--- a/parse_type/cardinality_field.py
|
|
+++ b/parse_type/cardinality_field.py
|
|
@@ -98,7 +98,7 @@ class CardinalityFieldTypeBuilder(object
|
|
|
|
.. code-block:: python
|
|
|
|
- import parse
|
|
+ from . import parse
|
|
|
|
@parse.with_pattern(r'\d+')
|
|
def parse_number(text):
|
|
--- a/parse_type/cfparse.py
|
|
+++ b/parse_type/cfparse.py
|
|
@@ -7,7 +7,7 @@ cardinality fields in (user-defined) typ
|
|
from __future__ import absolute_import
|
|
from .cardinality_field import CardinalityField, CardinalityFieldTypeBuilder
|
|
from .parse_util import FieldParser
|
|
-import parse
|
|
+from . import parse
|
|
import logging
|
|
|
|
|
|
--- a/parse_type/parse.py
|
|
+++ b/parse_type/parse.py
|
|
@@ -383,7 +383,7 @@ def with_pattern(pattern):
|
|
This annotates the type converter with the :attr:`pattern` attribute.
|
|
|
|
EXAMPLE:
|
|
- >>> import parse
|
|
+ >>> from . import parse
|
|
>>> @parse.with_pattern(r"\d+")
|
|
... def parse_number(text):
|
|
... return int(text)
|
|
--- a/tests/test_builder.py
|
|
+++ b/tests/test_builder.py
|
|
@@ -12,7 +12,7 @@ from .parse_type_test \
|
|
import parse_number, parse_yesno, parse_person_choice, parse_color, Color
|
|
from parse_type import TypeBuilder, build_type_dict
|
|
from enum import Enum
|
|
-import parse
|
|
+from parse_type import parse
|
|
import re
|
|
import unittest
|
|
|
|
--- a/tests/test_cardinality.py
|
|
+++ b/tests/test_cardinality.py
|
|
@@ -8,7 +8,7 @@ from __future__ import absolute_import
|
|
from .parse_type_test import ParseTypeTestCase, parse_number
|
|
from parse_type import Cardinality, TypeBuilder, build_type_dict
|
|
from parse_type.parse import Parser as ParserExt
|
|
-import parse
|
|
+from parse_type import parse
|
|
import unittest
|
|
|
|
# -----------------------------------------------------------------------------
|
|
--- a/tests/test_cardinality_field0.py
|
|
+++ b/tests/test_cardinality_field0.py
|
|
@@ -19,7 +19,7 @@ STATUS:
|
|
from __future__ import absolute_import
|
|
from .parse_type_test import ParseTypeTestCase
|
|
from parse_type import TypeBuilder, build_type_dict
|
|
-import parse
|
|
+from parse_type import parse
|
|
import unittest
|
|
|
|
ENABLED = False
|
|
--- a/tests/test_parse_decorator.py
|
|
+++ b/tests/test_parse_decorator.py
|
|
@@ -7,7 +7,7 @@ Integrated into :mod:`parse` module.
|
|
from __future__ import absolute_import
|
|
from .parse_type_test import ParseTypeTestCase
|
|
from parse_type import build_type_dict
|
|
-import parse
|
|
+from parse_type import parse
|
|
import unittest
|
|
|
|
|
|
@@ -24,7 +24,7 @@ class TestParseTypeWithPatternDecorator(
|
|
|
|
is equivalent to:
|
|
|
|
- >>> import parse
|
|
+ >>> from . import parse
|
|
>>> @parse.with_pattern(r"\d+")
|
|
... def parse_number(text):
|
|
... return int(text)
|
|
--- a/tests/test_parse_type_parse.py
|
|
+++ b/tests/test_parse_type_parse.py
|
|
@@ -13,10 +13,6 @@ See the end of the source file for the l
|
|
|
|
from __future__ import absolute_import
|
|
import unittest
|
|
-try:
|
|
- import unittest2 as unittest
|
|
-except ImportError:
|
|
- import unittest
|
|
# -- ADAPTATION-END
|
|
from datetime import datetime, time
|
|
import re
|
|
--- a/tests/parse_type_test.py
|
|
+++ b/tests/parse_type_test.py
|
|
@@ -3,10 +3,7 @@
|
|
from __future__ import absolute_import
|
|
from parse_type import TypeBuilder
|
|
from enum import Enum
|
|
-try:
|
|
- import unittest2 as unittest
|
|
-except ImportError:
|
|
- import unittest
|
|
+import unittest
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|