horsemeat 2.23.0__tar.gz → 2.23.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: horsemeat
-Version: 2.23.0
+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.23.0 → 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,7 +18,7 @@ import warnings
 
 # import clepy
 import jinja2
-import pkg_resources
+# import pkg_resources
 import psycopg2, psycopg2.extras
 import psycopg
 import yaml
@@ -78,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),
@@ -106,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)
 
@@ -250,7 +255,10 @@ class ConfigWrapper(object):
         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:
@@ -293,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.23.0 → horsemeat-2.23.1}/horsemeat/version.py

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

{horsemeat-2.23.0 → 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.23.0 → horsemeat-2.23.1}/horsemeat.egg-info/PKG-INFO

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