From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Thu, 12 Nov 2020 15:09:12 +0000 (+0000)
Subject: Import, but don't expose, documented objects in the package.
X-Git-Tag: 3.0.dev0~375
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=420ff94f7acc77f20de146548beaa527f8694f88;p=thirdparty%2Fpsycopg.git

Import, but don't expose, documented objects in the package.
---

diff --git a/psycopg3/.flake8 b/psycopg3/.flake8
new file mode 100644
index 000000000..98bc11f77
--- /dev/null
+++ b/psycopg3/.flake8
@@ -0,0 +1,4 @@
+# Used for Vim ALE integration, which doesn't honur the top-level config file
+[flake8]
+per-file-ignores =
+    psycopg3/__init__.py: F401
diff --git a/psycopg3/psycopg3/__init__.py b/psycopg3/psycopg3/__init__.py
index 780beece7..b411dabb0 100644
--- a/psycopg3/psycopg3/__init__.py
+++ b/psycopg3/psycopg3/__init__.py
@@ -6,25 +6,21 @@ psycopg3 -- PostgreSQL database adapter for Python
 
 from . import pq
 from .connection import AsyncConnection, Connection, Notify
+from .cursor import AsyncCursor, Cursor, Column
+from .copy import Copy, AsyncCopy
 
-from .errors import (
-    Warning,
-    Error,
-    InterfaceError,
-    DatabaseError,
-    DataError,
-    OperationalError,
-    IntegrityError,
-    InternalError,
-    ProgrammingError,
-    NotSupportedError,
-)
+from .errors import Warning, Error, InterfaceError, DatabaseError
+from .errors import DataError, OperationalError, IntegrityError
+from .errors import InternalError, ProgrammingError, NotSupportedError
 
 from .dbapi20 import BINARY, DATETIME, NUMBER, ROWID, STRING
 from .dbapi20 import Binary, Date, DateFromTicks, Time, TimeFromTicks
 from .dbapi20 import Timestamp, TimestampFromTicks
 
-from .version import __version__  # noqa
+from .version import __version__
+
+# register default adapters
+from . import types
 
 # DBAPI compliancy
 connect = Connection.connect
@@ -33,22 +29,8 @@ threadsafety = 2
 paramstyle = "pyformat"
 
 
-# register default adapters
-from . import types  # noqa
-
 # Override adapters with fast version if available
 if pq.__impl__ == "c":
-    from psycopg3_c._psycopg3 import register_builtin_c_loaders
-
-    register_builtin_c_loaders()
-
+    from psycopg3_c import _psycopg3
 
-__all__ = (
-    ["Warning", "Error", "InterfaceError", "DatabaseError", "DataError"]
-    + ["OperationalError", "IntegrityError", "InternalError"]
-    + ["ProgrammingError", "NotSupportedError"]
-    + ["AsyncConnection", "Connection", "Notify"]
-    + ["BINARY", "DATETIME", "NUMBER", "ROWID", "STRING"]
-    + ["Binary", "Date", "DateFromTicks", "Time", "TimeFromTicks"]
-    + ["Timestamp", "TimestampFromTicks"]
-)
+    _psycopg3.register_builtin_c_loaders()
diff --git a/tox.ini b/tox.ini
index 28fb22c6e..34b21b6ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,3 +22,5 @@ skip_install = true
 max-line-length = 85
 ignore = W503, E203
 extend-exclude = .venv
+per-file-ignores =
+    ./psycopg3/psycopg3/__init__.py: F401