horsemeat 2.23.0__tar.gz → 2.23.2__tar.gz

horsemeat-2.23.2/PKG-INFO

@@ -0,0 +1,20 @@
+Metadata-Version: 2.2
+Name: horsemeat
+Version: 2.23.2
+Summary: Web framework for the damned.  The mad.
+Home-page: https://github.com/216software/horsemeat
+Author: 216 Software, LLC
+Author-email: info@216software.com
+Classifier: Programming Language :: Python :: 3
+Requires-Dist: Jinja2>=2.6
+Requires-Dist: PyYAML>=3.10
+Requires-Dist: Werkzeug>=0.10.1
+Requires-Dist: decorator>=3.4.0
+Requires-Dist: psycopg2>=2.7
+Requires-Dist: gunicorn
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary

{horsemeat-2.23.0 → horsemeat-2.23.2}/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.2}/horsemeat/version.py

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

{horsemeat-2.23.0 → horsemeat-2.23.2}/horsemeat/webapp/handler.py

@@ -243,15 +243,21 @@ class Handler(object):
             if not hasattr(rp, "match"):
                 log.warning("This pattern {0!r} might not work right because it has no match method (i.e., it isn't a regex!).  You probably forgot to wrap it in re.compile...".format(rp))
 
-            match = req.line_one.test_for_match(rp)
+                # Just to be nice, let's check these as strings
+                if req.line_one == rp:
+                    return self.handle
 
-            if match:
+            else:
 
-                d = match.groupdict()
-                for k in d:
-                    req[k] = d[k]
+                match = rp.match(req.line_one)
 
-                return self.handle
+                if match:
+
+                    d = match.groupdict()
+                    for k in d:
+                        req[k] = d[k]
+
+                    return self.handle
 
     def check_route_strings(self, req):
 

{horsemeat-2.23.0 → horsemeat-2.23.2}/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):
 
@@ -618,7 +596,7 @@ class BiggerThanMemoryBuffer(ValueError):
     allowed amount to load into memory.
     """
 
-class LineOne(object):
+class LineOne(str):
 
     """
     Pretty much a boring old string, but can be compared against a

horsemeat-2.23.2/horsemeat.egg-info/PKG-INFO

@@ -0,0 +1,20 @@
+Metadata-Version: 2.2
+Name: horsemeat
+Version: 2.23.2
+Summary: Web framework for the damned.  The mad.
+Home-page: https://github.com/216software/horsemeat
+Author: 216 Software, LLC
+Author-email: info@216software.com
+Classifier: Programming Language :: Python :: 3
+Requires-Dist: Jinja2>=2.6
+Requires-Dist: PyYAML>=3.10
+Requires-Dist: Werkzeug>=0.10.1
+Requires-Dist: decorator>=3.4.0
+Requires-Dist: psycopg2>=2.7
+Requires-Dist: gunicorn
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary

horsemeat-2.23.0/PKG-INFO

@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: horsemeat
-Version: 2.23.0
-Summary: Web framework for the damned.  The mad.
-Home-page: https://github.com/216software/horsemeat
-Author: 216 Software, LLC
-Author-email: info@216software.com
-License: UNKNOWN
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
-
-UNKNOWN
-

horsemeat-2.23.0/horsemeat.egg-info/PKG-INFO

@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: horsemeat
-Version: 2.23.0
-Summary: Web framework for the damned.  The mad.
-Home-page: https://github.com/216software/horsemeat
-Author: 216 Software, LLC
-Author-email: info@216software.com
-License: UNKNOWN
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
-
-UNKNOWN
-