15
0

Accepting request 674923 from home:mcepl:branches:devel:languages:python

tralala

OBS-URL: https://build.opensuse.org/request/show/674923
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-parse_type?expand=0&rev=3
This commit is contained in:
2019-02-14 10:35:52 +00:00
committed by Git OBS Bridge
parent 9cb321c9b3
commit 7eba767da8
3 changed files with 86 additions and 129 deletions

74
testsuite-fix.patch Normal file
View File

@@ -0,0 +1,74 @@
--- a/tests/test_cardinality.py
+++ b/tests/test_cardinality.py
@@ -5,11 +5,12 @@ Test suite to test the :mod:`parse_type.
"""
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
import unittest
+from parse import Parser as ParserExt
+
+from .parse_type_test import ParseTypeTestCase, parse_number
+from parse_type import Cardinality, TypeBuilder, build_type_dict
# -----------------------------------------------------------------------------
# TEST CASE: TestCardinality
--- a/tests/test_builder.py
+++ b/tests/test_builder.py
@@ -495,35 +495,6 @@ Person: Alice
self.assertIsNotNone(result)
self.assertEqual(result.fixed, tuple(expected))
- def test_parse_with_many_unnamed_fields_with_variants(self):
- from parse_type.parse import Parser as Parser2
- type_dict = build_type_dict(self.TYPE_CONVERTERS)
- schema = """\
-Number: {:Number}
-YesNo: {:YesNo}
-Color: {:Color}
-Person: {:PersonChoice}
-Variant2: {:Color_or_PersonChoice}
-Variant1: {:Number_or_YesNo}
-"""
- # -- OMIT: XFAIL, due to group_index delta counting => Parser problem.
- parser = Parser2(schema, type_dict)
-
- text = """\
-Number: 12
-YesNo: yes
-Color: red
-Person: Alice
-Variant2: Bob
-Variant1: 42
-"""
- expected = [ 12, True, Color.red, "Alice", "Bob", 42 ]
-
- result = parser.parse(text)
- self.assertIsNotNone(result)
- self.assertEqual(result.fixed, tuple(expected))
-
-
# -----------------------------------------------------------------------------
# MAIN:
# -----------------------------------------------------------------------------
--- a/tests/test_parse_type_parse.py
+++ b/tests/test_parse_type_parse.py
@@ -22,14 +22,7 @@ from datetime import datetime, time
import re
# -- EXTENSION:
-import os
-PARSE_MODULE = os.environ.get("PARSE_TYPE_PARSE_MODULE", "parse_type.parse")
-if PARSE_MODULE.startswith("parse_type"):
- # -- USE VENDOR MODULE: parse_type.parse (probably older that original)
- from parse_type import parse
-else:
- # -- USE ORIGINAL MODULE: parse
- import parse
+import parse
# -- EXTENSION-END