chore: removed python2 libraries support and updated pg8000 lib

Author: casperr0

mamonsu/lib/config.py

@@ -10,10 +10,8 @@
 from mamonsu.plugins.pgsql.driver.checks import is_conn_to_db
 from mamonsu.lib.default_config import DefaultConfig
 
-if platform.PY2:
-    import ConfigParser as configparser
-else:
-    import configparser
+
+import configparser
 
 
 class Config(DefaultConfig):
@@ -76,7 +74,7 @@ def __init__(self, cfg_file=None, plugin_directories=None):
             sys.exit(1)
         else:
             if cfg_file is not None:
-                self.config.readfp(open(cfg_file))
+                self.config.read_file(open(cfg_file))
 
         plugins = self.fetch('plugins', 'directory', str)
         if plugins is not None:

mamonsu/lib/const.py

@@ -1,7 +1,6 @@
 from collections import namedtuple
 
 from mamonsu import __version__
-import mamonsu.lib.platform as platform
 
 
 class _template(object):
@@ -27,20 +26,11 @@ class _template(object):
 
 class _api(object):
 
-    if platform.PY2:
-        UNKNOWN_VERSION = 'UNKNOWN_API_VERSION\n'
-    else:
-        UNKNOWN_VERSION = b'UNKNOWN_API_VERSION\n'
+    UNKNOWN_VERSION = b'UNKNOWN_API_VERSION\n'
 
-    if platform.PY2:
-        METRIC_NOT_FOUND = 'METRIC_NOT_FOUND\n'
-    else:
-        METRIC_NOT_FOUND = b'METRIC_NOT_FOUND\n'
+    METRIC_NOT_FOUND = b'METRIC_NOT_FOUND\n'
 
-    if platform.PY2:
-        VERSION = '{0}'.format(__version__)
-    else:
-        VERSION = bytearray('{0}'.format(__version__), 'utf-8')
+    VERSION = bytearray('{0}'.format(__version__), 'utf-8')
 
     METRIC_LIST_URLS = ['/list', '/list/']
     METRIC_GET_URLS = ['/get', '/get/']

mamonsu/lib/platform.py

@@ -4,11 +4,4 @@
 WINDOWS = (sys.platform == 'win32' or sys.platform == 'win64')
 FREEBSD = ('freebsd' in sys.platform)
 UNIX = LINUX or FREEBSD
-
-PY2 = (sys.version_info[0] == 2)
-PY3 = (sys.version_info[0] == 3)
-
-if PY2:
-    INTEGER_TYPES = (int, long)
-if PY3:
-    INTEGER_TYPES = int,
+INTEGER_TYPES = int,

mamonsu/plugins/pgsql/driver/pg8000/__init__.py

@@ -1,12 +1,16 @@
-from .core import (
-    Warning, Bytea, DataError, DatabaseError, InterfaceError, ProgrammingError,
+from pg8000.core import (
+    Warning, DataError, DatabaseError, InterfaceError, ProgrammingError,
     Error, OperationalError, IntegrityError, InternalError, NotSupportedError,
-    ArrayContentNotHomogenousError, ArrayContentEmptyError,
-    ArrayDimensionsNotConsistentError, ArrayContentNotSupportedError, utc,
-    Connection, Cursor, Binary, Date, DateFromTicks, Time, TimeFromTicks,
-    Timestamp, TimestampFromTicks, BINARY, Interval)
+    ArrayContentNotHomogenousError, ArrayDimensionsNotConsistentError,
+    ArrayContentNotSupportedError, Connection, Cursor, Binary, Date,
+    DateFromTicks, Time, TimeFromTicks, Timestamp, TimestampFromTicks, BINARY,
+    Interval, PGEnum, PGJson, PGJsonb, PGTsvector, PGText, PGVarchar)
+from ._version import get_versions
+__version__ = get_versions()['version']
+del get_versions
 
 # Copyright (c) 2007-2009, Mathieu Fenniak
+# Copyright (c) The Contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,69 +41,19 @@
 
 
 def connect(
-        user=None, host='localhost', unix_sock=None, port=5432, database=None,
-        password=None, ssl=False, timeout=None,
-        application_name=None, **kwargs):
-    """Creates a connection to a PostgreSQL database.
-
-    This function is part of the `DBAPI 2.0 specification
-    <http://www.python.org/dev/peps/pep-0249/>`_; however, the arguments of the
-    function are not defined by the specification.
-
-    :param user:
-        The username to connect to the PostgreSQL server with. If this is not
-        provided, pg8000 looks first for the PGUSER then the USER environment
-        variables.
-
-        If your server character encoding is not ``ascii`` or ``utf8``, then
-        you need to provide ``user`` as bytes, eg.
-        ``"my_name".encode('EUC-JP')``.
-
-    :keyword host:
-        The hostname of the PostgreSQL server to connect with.  Providing this
-        parameter is necessary for TCP/IP connections.  One of either ``host``
-        or ``unix_sock`` must be provided. The default is ``localhost``.
-
-    :keyword unix_sock:
-        The path to the UNIX socket to access the database through, for
-        example, ``'/tmp/.s.PGSQL.5432'``.  One of either ``host`` or
-        ``unix_sock`` must be provided.
-
-    :keyword port:
-        The TCP/IP port of the PostgreSQL server instance.  This parameter
-        defaults to ``5432``, the registered common port of PostgreSQL TCP/IP
-        servers.
-
-    :keyword database:
-        The name of the database instance to connect with.  This parameter is
-        optional; if omitted, the PostgreSQL server will assume the database
-        name is the same as the username.
-
-        If your server character encoding is not ``ascii`` or ``utf8``, then
-        you need to provide ``database`` as bytes, eg.
-        ``"my_db".encode('EUC-JP')``.
-
-    :keyword password:
-        The user password to connect to the server with.  This parameter is
-        optional; if omitted and the database server requests password-based
-        authentication, the connection will fail to open.  If this parameter
-        is provided but not requested by the server, no error will occur.
-
-    :keyword ssl:
-        Use SSL encryption for TCP/IP sockets if ``True``.  Defaults to
-        ``False``.
-
-    :keyword timeout:
-        Only used with Python 3, this is the time in seconds before the
-        connection to the database will time out. The default is ``None`` which
-        means no timeout.
-
-    :rtype:
-        A :class:`Connection` object.
-    """
+        user, host='localhost', database=None, port=5432, password=None,
+        source_address=None, unix_sock=None, ssl_context=None, timeout=None,
+        max_prepared_statements=1000, tcp_keepalive=True,
+        application_name=None, replication=None):
+
     return Connection(
-        user, host, unix_sock, port, database,
-        password, ssl, timeout, application_name)
+        user, host=host, database=database, port=port, password=password,
+        source_address=source_address, unix_sock=unix_sock,
+        ssl_context=ssl_context, timeout=timeout,
+        max_prepared_statements=max_prepared_statements,
+        tcp_keepalive=tcp_keepalive, application_name=application_name,
+        replication=replication)
+
 
 apilevel = "2.0"
 """The DBAPI level supported, currently "2.0".
@@ -108,37 +62,17 @@ def connect(
 <http://www.python.org/dev/peps/pep-0249/>`_.
 """
 
-threadsafety = 3
+threadsafety = 1
 """Integer constant stating the level of thread safety the DBAPI interface
-supports.  This DBAPI module supports sharing the module, connections, and
-cursors, resulting in a threadsafety value of 3.
+supports. This DBAPI module supports sharing of the module only. Connections
+and cursors my not be shared between threads. This gives pg8000 a threadsafety
+value of 1.
 
 This property is part of the `DBAPI 2.0 specification
 <http://www.python.org/dev/peps/pep-0249/>`_.
 """
 
 paramstyle = 'format'
-"""String property stating the type of parameter marker formatting expected by
-the interface.  This value defaults to "format", in which parameters are
-marked in this format: "WHERE name=%s".
-
-This property is part of the `DBAPI 2.0 specification
-<http://www.python.org/dev/peps/pep-0249/>`_.
-
-As an extension to the DBAPI specification, this value is not constant; it
-can be changed to any of the following values:
-
-    qmark
-        Question mark style, eg. ``WHERE name=?``
-    numeric
-        Numeric positional style, eg. ``WHERE name=:1``
-    named
-        Named style, eg. ``WHERE name=:paramname``
-    format
-        printf format codes, eg. ``WHERE name=%s``
-    pyformat
-        Python format codes, eg. ``WHERE name=%(paramname)s``
-"""
 
 # I have no idea what this would be used for by a client app.  Should it be
 # TEXT, VARCHAR, CHAR?  It will only compare against row_description's
@@ -159,12 +93,13 @@ def connect(
 """ROWID type oid"""
 
 __all__ = [
-    Warning, Bytea, DataError, DatabaseError, connect, InterfaceError,
+    Warning, DataError, DatabaseError, connect, InterfaceError,
     ProgrammingError, Error, OperationalError, IntegrityError, InternalError,
-    NotSupportedError, ArrayContentNotHomogenousError, ArrayContentEmptyError,
-    ArrayDimensionsNotConsistentError, ArrayContentNotSupportedError, utc,
+    NotSupportedError, ArrayContentNotHomogenousError,
+    ArrayDimensionsNotConsistentError, ArrayContentNotSupportedError,
     Connection, Cursor, Binary, Date, DateFromTicks, Time, TimeFromTicks,
-    Timestamp, TimestampFromTicks, BINARY, Interval]
+    Timestamp, TimestampFromTicks, BINARY, Interval, PGEnum, PGJson, PGJsonb,
+    PGTsvector, PGText, PGVarchar]
 
 """Version string for pg8000.
 

mamonsu/plugins/pgsql/driver/pg8000/_version.py

@@ -0,0 +1,21 @@
+
+# This file was generated by 'versioneer.py' (0.15) from
+# revision-control system data, or from the parent directory name of an
+# unpacked source archive. Distribution tarballs contain a pre-generated copy
+# of this file.
+
+import json
+import sys
+
+version_json = '''
+{
+ "dirty": false,
+ "error": null,
+ "full-revisionid": "91062e7d4a05b76ab38b8146427a54987d6d1269",
+ "version": "1.15.3"
+}
+'''  # END VERSION_JSON
+
+
+def get_versions():
+    return json.loads(version_json)