From: Daniele Varrazzo Date: Fri, 20 May 2022 08:01:50 +0000 (+0200) Subject: test: define the eur unicode char only once X-Git-Tag: 3.1~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d22a8c1dc0d3b4eddc274a5d76056b20cd1d7632;p=thirdparty%2Fpsycopg.git test: define the eur unicode char only once --- diff --git a/tests/test_copy.py b/tests/test_copy.py index bda6f1109..e343cde0a 100644 --- a/tests/test_copy.py +++ b/tests/test_copy.py @@ -17,9 +17,7 @@ from psycopg.types import TypeInfo from psycopg.types.hstore import register_hstore from psycopg.types.numeric import Int4 -from .utils import gc_collect - -eur = "\u20ac" +from .utils import eur, gc_collect sample_records = [(10, 20, "hello"), (40, None, "world")] diff --git a/tests/test_copy_async.py b/tests/test_copy_async.py index b759b0554..36a10c01e 100644 --- a/tests/test_copy_async.py +++ b/tests/test_copy_async.py @@ -17,9 +17,9 @@ from psycopg.adapt import PyFormat from psycopg.types.hstore import register_hstore from psycopg.types.numeric import Int4 -from .utils import alist, gc_collect +from .utils import alist, eur, gc_collect from .test_copy import sample_text, sample_binary, sample_binary_rows # noqa -from .test_copy import eur, sample_values, sample_records, sample_tabledef +from .test_copy import sample_values, sample_records, sample_tabledef from .test_copy import py_to_raw pytestmark = pytest.mark.asyncio diff --git a/tests/test_errors.py b/tests/test_errors.py index 22e38688d..82a4dc8f0 100644 --- a/tests/test_errors.py +++ b/tests/test_errors.py @@ -8,9 +8,7 @@ import psycopg from psycopg import pq from psycopg import errors as e -from .utils import gc_collect - -eur = "\u20ac" +from .utils import eur, gc_collect def test_error_diag(conn): diff --git a/tests/test_sql.py b/tests/test_sql.py index e7a84b10e..304bcc779 100644 --- a/tests/test_sql.py +++ b/tests/test_sql.py @@ -13,7 +13,7 @@ from psycopg._encodings import py2pgenc from psycopg.types import TypeInfo from psycopg.types.string import StrDumper -eur = "\u20ac" +from .utils import eur @pytest.mark.parametrize( diff --git a/tests/types/test_composite.py b/tests/types/test_composite.py index 2c5b6703b..1ca4a6220 100644 --- a/tests/types/test_composite.py +++ b/tests/types/test_composite.py @@ -7,7 +7,7 @@ from psycopg.types.range import Range from psycopg.types.composite import CompositeInfo, register_composite from psycopg.types.composite import TupleDumper, TupleBinaryDumper -eur = "\u20ac" +from ..utils import eur tests_str = [ ("", ()), diff --git a/tests/types/test_multirange.py b/tests/types/test_multirange.py index bbc389011..5dd9b0990 100644 --- a/tests/types/test_multirange.py +++ b/tests/types/test_multirange.py @@ -12,7 +12,8 @@ from psycopg.types import multirange from psycopg.types.multirange import Multirange, MultirangeInfo from psycopg.types.multirange import register_multirange -from .test_range import create_test_range, eur +from ..utils import eur +from .test_range import create_test_range pytestmark = pytest.mark.pg(">= 14") diff --git a/tests/types/test_range.py b/tests/types/test_range.py index 163b1ef02..6ab76280a 100644 --- a/tests/types/test_range.py +++ b/tests/types/test_range.py @@ -10,7 +10,7 @@ from psycopg.adapt import PyFormat from psycopg.types import range as range_module from psycopg.types.range import Range, RangeInfo, register_range -eur = "\u20ac" +from ..utils import eur type2sub = { "int4range": "int4", diff --git a/tests/types/test_string.py b/tests/types/test_string.py index a5f58900a..132006c57 100644 --- a/tests/types/test_string.py +++ b/tests/types/test_string.py @@ -7,7 +7,7 @@ from psycopg import errors as e from psycopg.adapt import PyFormat from psycopg import Binary -eur = "\u20ac" +from ..utils import eur # # tests with text diff --git a/tests/utils.py b/tests/utils.py index 677df2688..80ec6afd8 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -4,6 +4,8 @@ import operator import pytest +eur = "\u20ac" + def check_libpq_version(got, want): """