horsemeat 2.21.7__tar.gz → 2.22.1__tar.gz

{horsemeat-2.21.7 → horsemeat-2.22.1}/PKG-INFO

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

{horsemeat-2.21.7 → horsemeat-2.22.1}/README

@@ -1 +1,3 @@
 This is a web framework for the damned.  The mad.
+
+

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat/configwrapper.py

@@ -15,7 +15,7 @@ import traceback
 import uuid
 import warnings
 
-import clepy
+# import clepy
 import jinja2
 import pkg_resources
 import psycopg2, psycopg2.extras
@@ -327,7 +327,7 @@ class ConfigWrapper(object):
 
         # Add a bunch of stuff to the template namespace.
         j.globals['ceil'] = math.ceil
-        j.globals['clepy'] = clepy
+        # j.globals['clepy'] = clepy
         j.globals['datetime'] = datetime
         j.globals['dir'] = dir
         j.globals['enumerate'] = enumerate
@@ -483,7 +483,7 @@ class ConfigWrapper(object):
     @abc.abstractproperty
     def dispatcher_class(self):
 
-        print "you have to define this in the subclass!"
+        print("you have to define this in the subclass!")
 
         raise NotImplementedError
 

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat/scripts/make-frippery-project

@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /bin/bash -ex
 
 if (( $# != 2 ))
 then

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat/version.py

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

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat/webapp/handler.py

@@ -7,7 +7,6 @@ import sys
 import textwrap
 import warnings
 
-import clepy
 import decorator
 import jinja2
 

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat/webapp/request.py

@@ -20,7 +20,7 @@ from werkzeug.wrappers import Request as WerkzeugRequest
 
 log = logging.getLogger(__name__)
 
-class Request(collections.abc.MutableMapping if sys.version_info >= (3,10) else collections.MutableMapping):
+class Request(collections.MutableMapping):
 
     """
     Wraps up the environ dictionary in an object with lots of cute
@@ -76,7 +76,7 @@ class Request(collections.abc.MutableMapping if sys.version_info >= (3,10) else
         >>> req.parsed_QS['flavor'][0] == u'Jalapeño' # doctest: +SKIP
         True
 
-        >>> print req.parsed_QS['flavor'][0] # doctest: +SKIP
+        >>> print(req.parsed_QS['flavor'][0]) # doctest: +SKIP
         Jalapeño
 
         """
@@ -214,7 +214,7 @@ class Request(collections.abc.MutableMapping if sys.version_info >= (3,10) else
         >>> req.parsed_body['flavor'][0] == u'Jalape\xf1o' # doctest: +SKIP
         True
 
-        >>> print req.parsed_body['flavor'][0] # doctest: +SKIP
+        >>> print(req.parsed_body['flavor'][0]) # doctest: +SKIP
         Jalapeño
 
         >>> 'novalue' in req.parsed_body # doctest: +SKIP

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat/webapp/response.py

@@ -9,7 +9,28 @@ import pprint
 import urllib
 import sys
 
-import clepy
+def listmofize(x):
+
+    """
+    Return x inside a list if it isn't already a list or tuple.
+    Otherwise, return x.
+
+    >>> listmofize('abc')
+    ['abc']
+
+    >>> listmofize(['abc', 'def'])
+    ['abc', 'def']
+
+    >>> listmofize((1,2))
+    (1, 2)
+
+    listmofize used to live in the clepy package, but the use2to3 option
+    in setup.py no longer works, and I'm not gonna rewrite all that for
+    this one function.
+    """
+
+    if not isinstance(x, (list, tuple)): return [x]
+    else: return x
 
 log = logging.getLogger(__name__)
 
@@ -40,7 +61,7 @@ class Response(object):
         from gunicorn.http.wsgi import FileWrapper
 
         if not isinstance(val, FileWrapper):
-            self._body = clepy.listmofize(val)
+            self._body = listmofize(val)
         else:
             self._body = val
 
@@ -59,10 +80,10 @@ class Response(object):
 
         # Remember that in python 3, unicode stuff is just a string.
         elif isinstance(val, str):
-            self._body = clepy.listmofize(bytes(val, "utf-8"))
+            self._body = listmofize(bytes(val, "utf-8"))
 
         else:
-            self._body = clepy.listmofize(val)
+            self._body = listmofize(val)
 
     @body.setter
     def body(self, val):

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat/webapp/scrubber.py

@@ -84,7 +84,7 @@ class Scrubber(object):
         >>> try:
         ...     Scrubber.validate_email_address('a@b')
         ... except Exception as ex:
-        ...     print "bad email!"
+        ...     print("bad email!")
         bad email!
 
         """

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat.egg-info/PKG-INFO

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

{horsemeat-2.21.7 → horsemeat-2.22.1}/horsemeat.egg-info/requires.txt

@@ -1,8 +1,6 @@
 Jinja2>=2.6
 PyYAML>=3.10
 Werkzeug>=0.10.1
-clepy>=0.3.23
 decorator>=3.4.0
-gunicorn
-nose>=1.3.3
 psycopg2>=2.7
+gunicorn

{horsemeat-2.21.7 → horsemeat-2.22.1}/requirements.txt

@@ -3,6 +3,6 @@ PyYAML>=3.10
 Werkzeug>=0.10.1
 decorator>=3.4.0
 psycopg2>=2.7
-clepy>=0.3.23
+# clepy>=0.3.23
 nose>=1.3.3
 gunicorn

{horsemeat-2.21.7 → horsemeat-2.22.1}/setup.py

@@ -5,29 +5,17 @@ import sys
 
 from setuptools import find_packages, setup
 
-try:
-    from pip.req import parse_requirements
-except ImportError:
-    # The req module has been moved to pip._internal in the 10
-    # release.
-    from pip._internal.req import parse_requirements
-
 # Read __version__ from version.py
 with open(os.path.join(os.getcwd(), "horsemeat", "version.py")) as f:
     exec(f.read())
 
-requirements = [str(req.requirement) if hasattr(req, "requirement") else str(req.req)
-    for req in parse_requirements(
-        "requirements.txt",
-        session="setup.py")]
-
 setup(
 
     name='horsemeat',
 
     author="216 Software, LLC",
     author_email="info@216software.com",
-    url="https://GitHub.com/216software/horsemeat",
+    url="https://github.com/216software/horsemeat",
     description='Web framework for the damned.  The mad.',
 
     version=__version__,
@@ -38,12 +26,22 @@ setup(
 
     # package_dir={'horsemeat': 'horsemeat'},
 
-    install_requires=requirements,
+    # install_requires=requirements,
+
+    install_requires=[
+        "Jinja2>=2.6",
+        "PyYAML>=3.10",
+        "Werkzeug>=0.10.1",
+        "decorator>=3.4.0",
+        "psycopg2>=2.7",
+        # "nose>=1.3.3",
+        "gunicorn",
+    ],
 
-    use_2to3=True,
+    # use_2to3=True,
 
     # test_suite="horsemeat.tests",
-    test_suite="nose.collector",
+    # test_suite="nose.collector",
     # test_suite="horsemeat",
 
     classifiers=[