horsemeat 2.22.13__tar.gz → 2.23.1__tar.gz

{horsemeat-2.22.13 → horsemeat-2.23.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: horsemeat
-Version: 2.22.13
+Version: 2.23.1
 Summary: Web framework for the damned.  The mad.
 Home-page: https://github.com/216software/horsemeat
 Author: 216 Software, LLC

{horsemeat-2.22.13 → horsemeat-2.23.1}/horsemeat/configwrapper.py

@@ -3,6 +3,7 @@
 import abc
 import contextlib
 import datetime
+import importlib
 import json
 import logging
 import logging.config
@@ -17,8 +18,9 @@ import warnings
 
 # import clepy
 import jinja2
-import pkg_resources
+# import pkg_resources
 import psycopg2, psycopg2.extras
+import psycopg
 import yaml
 
 from horsemeat import fancyjsondumps
@@ -77,9 +79,11 @@ class ConfigWrapper(object):
 
         else:
 
-            stream = pkg_resources.resource_stream(
-                cls.configmodule,
-                filename)
+            stream = importlib.resources.files(cls.configmodule).joinpath(filename).open()
+
+            # stream = pkg_resources.resource_stream(
+            #     cls.configmodule,
+            #     filename)
 
             self = cls(
                 yaml.safe_load(stream),
@@ -105,9 +109,11 @@ class ConfigWrapper(object):
 
             return self
 
-        elif pkg_resources.resource_exists(
-            cls.configmodule,
-            path_to_file):
+        # elif pkg_resources.resource_exists(
+            # cls.configmodule,
+            # path_to_file):
+
+        elif importlib.resources.files(cls.configmodule).joinpath(path_to_file).exists():
 
             return cls.from_yaml_file_name(path_to_file)
 
@@ -185,7 +191,39 @@ class ConfigWrapper(object):
     def database_password(self):
         return self.config_dictionary['postgresql'].get('password')
 
-    def make_database_connection(self, register_composite_types=True):
+    def make_psycopg_database_connection(self, register_composite_types=True):
+
+        """
+        This is NOT psycopg2, but psycopg3, which goes by psycopg.
+        """
+
+        if self.config_dictionary["postgresql"].get("psycopg_version") != "psycopg":
+
+            raise Exception("Add a 'psycopg_version' key under postgresql in your yaml file and set it to 'psycopg' to use this!")
+
+        else:
+
+            pgconn = psycopg.connect(
+                row_factory=psycopg.rows.namedtuple_row,
+                port=self.database_port,
+                dbname=self.database_name,
+                host=self.database_host,
+                user=self.database_user,
+                password=self.database_password)
+
+            log.info(f"Just made postgresql connection {pgconn} (composite types registered: {register_composite_types}.")
+
+            # psycopg2.extras.register_uuid()
+            # psycopg2.extras.register_hstore(pgconn, globally=True)
+            # psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
+            # psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
+
+            if register_composite_types:
+                self.register_psycopg_composite_types(pgconn)
+
+            return pgconn
+
+    def make_psycopg2_database_connection(self, register_composite_types=True):
 
         pgconn = psycopg2.connect(
             connection_factory=psycopg2.extras.NamedTupleConnection,
@@ -204,15 +242,40 @@ class ConfigWrapper(object):
         psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
 
         if register_composite_types:
-            self.register_composite_types(pgconn)
+            self.register_psycopg2_composite_types(pgconn)
 
         return pgconn
 
+    def make_database_connection(self, register_composite_types=True):
+
+        """
+        Defaults to psycopg2, not the fancy newer psycopg, which is
+        really psycopg3.
+
+        Add a config entry to use the fancy one.
+        """
+
+        # Pretty quick, move to psycopg from psycopg2 but this is here
+        # until I get tests passing.
+        if self.config_dictionary["postgresql"].get("psycopg_version") != "psycopg":
+            1/0
+            return self.make_psycopg2_database_connection(register_composite_types=register_composite_types)
+
+        else:
+            return self.make_psycopg_database_connection(register_composite_types=register_composite_types)
+
     # Make aliases because Matt can't remember stuff well.
     create_postgresql_connection = make_database_connection
     make_postgresql_connection = make_database_connection
 
-    def register_composite_types(self, pgconn):
+    def register_psycopg_composite_types(self, pgconn):
+
+        """
+        Subclasses can define this if they want to.
+        """
+        pass
+
+    def register_psycopg2_composite_types(self, pgconn):
 
         """
         Subclasses can define this if they want to.
@@ -238,13 +301,17 @@ class ConfigWrapper(object):
 
             if isinstance(x, str):
 
-                warnings.warn("Stop it! Define logging configuration "
+                warnings.warn("Stop it! Define logging configuration in"
                     "the same YAML file!")
 
                 logging.config.fileConfig(
-                    pkg_resources.resource_filename(
-                        'horsemeat.configs.logging_configs',
-                        x))
+                    importlib.resources.files('horsemeat').joinpath("configs").joinpath("logging_configs"),
+                    x)
+
+                # logging.config.fileConfig(
+                #     pkg_resources.resource_filename(
+                #         'horsemeat.configs.logging_configs',
+                #         x))
 
             elif isinstance(x, dict):
                 logging.config.dictConfig(x)

{horsemeat-2.22.13 → horsemeat-2.23.1}/horsemeat/version.py

@@ -22,4 +22,4 @@ hasn't been installed yet.
 
 """
 
-__version__ = '2.22.13'
+__version__ = '2.23.1'

{horsemeat-2.22.13 → horsemeat-2.23.1}/horsemeat/webapp/request.py

@@ -537,28 +537,6 @@ class Request(collections.abc.MutableMapping):
         else:
             return 'UTF-8'
 
-
-    def get_binder_id(self):
-
-        if 'binder_id' in self:
-            return self['binder_id']
-
-        if 'binder_id' in self.wz_req.args:
-            self['binder_id'] = int(self.wz_req.args['binder_id'])
-            return self['binder_id']
-
-        elif 'binder_id' in self.wz_req.form:
-            self['binder_id'] = int(self.wz_req.form['binder_id'])
-            return self['binder_id']
-
-        elif self.global_session_data \
-        and 'binder_id' in self.global_session_data:
-            self['binder_id'] = self.global_session_data['binder_id']
-            return self['binder_id']
-
-        else:
-            raise ValueError('Sorry, could not figure out binder ID')
-
     @property
     def json(self):
 

{horsemeat-2.22.13 → horsemeat-2.23.1}/horsemeat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: horsemeat
-Version: 2.22.13
+Version: 2.23.1
 Summary: Web framework for the damned.  The mad.
 Home-page: https://github.com/216software/horsemeat
 Author: 216 Software, LLC

{horsemeat-2.22.13 → horsemeat-2.23.1}/requirements.txt

@@ -6,3 +6,4 @@ psycopg2>=2.7
 # clepy>=0.3.23
 nose>=1.3.3
 gunicorn
+psycopg