summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py12
-rw-r--r--lib/sqlalchemy/dialects/postgresql/pg8000.py7
-rw-r--r--lib/sqlalchemy/dialects/postgresql/psycopg2.py6
-rw-r--r--test/dialect/postgresql/test_types.py9
4 files changed, 3 insertions, 31 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 5cef5d929..3bd7e62d5 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -992,6 +992,7 @@ E.g.::
from collections import defaultdict
import datetime as dt
import re
+from uuid import UUID as _python_UUID
from . import array as _array
from . import hstore as _hstore
@@ -1023,12 +1024,6 @@ from ...types import TEXT
from ...types import VARCHAR
-try:
- from uuid import UUID as _python_UUID # noqa
-except ImportError:
- _python_UUID = None
-
-
IDX_USING = re.compile(r"^(?:btree|hash|gist|gin|[\w_]+)$", re.I)
AUTOCOMMIT_REGEXP = re.compile(
@@ -1302,11 +1297,6 @@ class UUID(sqltypes.TypeEngine):
DBAPI.
"""
- if as_uuid and _python_UUID is None:
- raise NotImplementedError(
- "This version of Python does not support "
- "the native UUID type."
- )
self.as_uuid = as_uuid
def bind_processor(self, dialect):
diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py
index 197d11cf4..57c8f5a9a 100644
--- a/lib/sqlalchemy/dialects/postgresql/pg8000.py
+++ b/lib/sqlalchemy/dialects/postgresql/pg8000.py
@@ -69,6 +69,7 @@ of the :ref:`psycopg2 <psycopg2_isolation_level>` dialect:
""" # noqa
import decimal
import re
+from uuid import UUID as _python_UUID
from .base import _DECIMAL_TYPES
from .base import _FLOAT_TYPES
@@ -86,12 +87,6 @@ from ... import util
from ...sql.elements import quoted_name
-try:
- from uuid import UUID as _python_UUID # noqa
-except ImportError:
- _python_UUID = None
-
-
class _PGNumeric(sqltypes.Numeric):
def result_processor(self, dialect, coltype):
if self.asdecimal:
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index 850e5717c..2161b24fc 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -466,6 +466,7 @@ from __future__ import absolute_import
import decimal
import logging
import re
+from uuid import UUID as _python_UUID
from .base import _DECIMAL_TYPES
from .base import _FLOAT_TYPES
@@ -486,11 +487,6 @@ from ... import util
from ...engine import cursor as _cursor
from ...util import collections_abc
-try:
- from uuid import UUID as _python_UUID # noqa
-except ImportError:
- _python_UUID = None
-
logger = logging.getLogger("sqlalchemy.dialects.postgresql")
diff --git a/test/dialect/postgresql/test_types.py b/test/dialect/postgresql/test_types.py
index d22989291..95486b197 100644
--- a/test/dialect/postgresql/test_types.py
+++ b/test/dialect/postgresql/test_types.py
@@ -33,7 +33,6 @@ from sqlalchemy import Unicode
from sqlalchemy import util
from sqlalchemy.dialects import postgresql
from sqlalchemy.dialects.postgresql import array
-from sqlalchemy.dialects.postgresql import base
from sqlalchemy.dialects.postgresql import DATERANGE
from sqlalchemy.dialects.postgresql import HSTORE
from sqlalchemy.dialects.postgresql import hstore
@@ -2135,14 +2134,6 @@ class UUIDTest(fixtures.TestBase):
def test_uuid_array(self, datatype, value1, value2, connection):
self.test_round_trip(datatype, value1, value2, connection)
- def test_no_uuid_available(self):
- uuid_type = base._python_UUID
- base._python_UUID = None
- try:
- assert_raises(NotImplementedError, postgresql.UUID, as_uuid=True)
- finally:
- base._python_UUID = uuid_type
-
class HStoreTest(AssertsCompiledSQL, fixtures.TestBase):
__dialect__ = "postgresql"