feat: update python-bottle to 0.12.25

Author: Zeno-sole

.travis.yml

@@ -3,7 +3,7 @@ VERSION = $(shell python setup.py --version)
 ALLFILES = $(shell echo bottle.py test/*.py test/views/*.tpl)
 VENV = build/venv
 
-.PHONY: release coverage install docs test test_all test_25 test_26 test_27 test_31 test_32 test_33 2to3 clean
+.PHONY: release coverage install docs test 2to3 clean
 
 release: clean venv
 	$(VENV)/bin/python3 setup.py --version | egrep -q -v '[a-zA-Z]' # Fail on dev/rc versions
@@ -12,7 +12,7 @@ release: clean venv
 	git push origin HEAD                                # Fail on out-of-sync upstream
 	git push origin tag $(VERSION)                      # Fail on dublicate tag
 	$(VENV)/bin/python3 setup.py sdist bdist_wheel      # Build project
-	$(VENV)/bin/twine upload dist/$(VERSION)*           # Release to pypi
+	$(VENV)/bin/twine upload dist/bottle-$(VERSION)*    # Release to pypi
 
 venv: $(VENV)/.installed
 $(VENV)/.installed: Makefile
@@ -25,12 +25,12 @@ $(VENV)/.installed: Makefile
 coverage:
 	-mkdir build/
 	coverage erase
-	COVERAGE_PROCESS_START=.coveragerc test/testall.py
+	COVERAGE_PROCESS_START=.coveragerc python -m unittest discover
 	coverage combine
 	coverage report
 	coverage html
 
-push: test_all
+push: test
 	git push origin HEAD
 
 install:
@@ -40,30 +40,7 @@ docs:
 	sphinx-build -b html -d build/docs/doctrees docs build/docs/html
 
 test:
-	python test/testall.py
-
-test_all: test_25 test_26 test_27 test_31 test_32 test_33 test_34
-
-test_25:
-	python2.5 test/testall.py
-
-test_26:
-	python2.6 test/testall.py
-
-test_27:
-	python2.7 test/testall.py
-
-test_31:
-	python3.1 test/testall.py
-
-test_32:
-	python3.2 test/testall.py
-
-test_33:
-	python3.3 test/testall.py
-
-test_34:
-	python3.4 test/testall.py
+	python -m unittest discover
 
 clean:
 	rm -rf build/ dist/ MANIFEST 2>/dev/null || true

Makefile

@@ -16,7 +16,7 @@
 from __future__ import with_statement
 
 __author__ = 'Marcel Hellkamp'
-__version__ = '0.12.19'
+__version__ = '0.12.25'
 __license__ = 'MIT'
 
 # The gevent server adapter needs to patch some modules before they are imported
@@ -41,7 +41,6 @@
 from datetime import date as datedate, datetime, timedelta
 from tempfile import TemporaryFile
 from traceback import format_exc, print_exc
-from inspect import getargspec
 from unicodedata import normalize
 
 
@@ -93,6 +92,12 @@ def _e(): return sys.exc_info()[1]
     import pickle
     from io import BytesIO
     from configparser import ConfigParser
+    from inspect import getfullargspec
+    def getargspec(func):
+        spec = getfullargspec(func)
+        kwargs = makelist(spec[0]) + makelist(spec.kwonlyargs)
+        return kwargs, spec[1], spec[2], spec[3]
+
     basestring = str
     unicode = str
     json_loads = lambda s: json_lds(touni(s))
@@ -110,6 +115,7 @@ def _raise(*a): raise a[0](a[1]).with_traceback(a[2])
     from imp import new_module
     from StringIO import StringIO as BytesIO
     from ConfigParser import SafeConfigParser as ConfigParser
+    from inspect import getargspec
     if py25:
         msg  = "Python 2.5 support may be dropped in future versions of Bottle."
         warnings.warn(msg, DeprecationWarning)
@@ -302,7 +308,7 @@ def add_filter(self, name, func):
     rule_syntax = re.compile('(\\\\*)'\
         '(?:(?::([a-zA-Z_][a-zA-Z_0-9]*)?()(?:#(.*?)#)?)'\
           '|(?:<([a-zA-Z_][a-zA-Z_0-9]*)?(?::([a-zA-Z_]*)'\
-            '(?::((?:\\\\.|[^\\\\>]+)+)?)?)?>))')
+            '(?::((?:\\\\.|[^\\\\>])+)?)?)?>))')
 
     def _itertokens(self, rule):
         offset, prefix = 0, ''
@@ -559,7 +565,7 @@ def get_callback_args(self):
     def get_config(self, key, default=None):
         ''' Lookup a config field and return its value, first checking the
             route.config, then route.app.config.'''
-        for conf in (self.config, self.app.conifg):
+        for conf in (self.config, self.app.config):
             if key in conf: return conf[key]
         return default
 
@@ -848,17 +854,19 @@ def default_error_handler(self, res):
         return tob(template(ERROR_PAGE_TEMPLATE, e=res))
 
     def _handle(self, environ):
-        path = environ['bottle.raw_path'] = environ['PATH_INFO']
-        if py3k:
-            try:
-                environ['PATH_INFO'] = path.encode('latin1').decode('utf8')
-            except UnicodeError:
-                return HTTPError(400, 'Invalid path string. Expected UTF-8')
-
         try:
+
             environ['bottle.app'] = self
             request.bind(environ)
             response.bind()
+
+            path = environ['bottle.raw_path'] = environ['PATH_INFO']
+            if py3k:
+                try:
+                    environ['PATH_INFO'] = path.encode('latin1').decode('utf8')
+                except UnicodeError:
+                    return HTTPError(400, 'Invalid path string. Expected UTF-8')
+
             try:
                 self.trigger_hook('before_request')
                 route, args = self.router.match(environ)
@@ -1087,6 +1095,7 @@ def forms(self):
             :class:`FormsDict`. All keys and values are strings. File uploads
             are stored separately in :attr:`files`. """
         forms = FormsDict()
+        forms.recode_unicode = self.POST.recode_unicode
         for name, item in self.POST.allitems():
             if not isinstance(item, FileUpload):
                 forms[name] = item
@@ -1110,6 +1119,7 @@ def files(self):
 
         """
         files = FormsDict()
+        files.recode_unicode = self.POST.recode_unicode
         for name, item in self.POST.allitems():
             if isinstance(item, FileUpload):
                 files[name] = item
@@ -1235,15 +1245,16 @@ def POST(self):
                                          newline='\n')
         elif py3k:
             args['encoding'] = 'utf8'
+            post.recode_unicode = False
         data = cgi.FieldStorage(**args)
         self['_cgi.FieldStorage'] = data #http://bugs.python.org/issue18394#msg207958
         data = data.list or []
         for item in data:
-            if item.filename:
+            if item.filename is None:
+                post[item.name] = item.value
+            else:
                 post[item.name] = FileUpload(item.file, item.name,
                                              item.filename, item.headers)
-            else:
-                post[item.name] = item.value
         return post
 
     @property
@@ -1746,7 +1757,7 @@ def apply(self, callback, route):
         def wrapper(*a, **ka):
             try:
                 rv = callback(*a, **ka)
-            except HTTPError:
+            except HTTPResponse:
                 rv = _e()
 
             if isinstance(rv, dict):
@@ -2689,6 +2700,7 @@ def auth_basic(check, realm="private", text="Access denied"):
     ''' Callback decorator to require HTTP auth (basic).
         TODO: Add route(check_auth=...) parameter. '''
     def decorator(func):
+        @functools.wraps(func)
         def wrapper(*a, **ka):
             user, password = request.auth or (None, None)
             if user is None or not check(user, password):
@@ -2792,7 +2804,11 @@ class server_cls(server_cls):
 
 class CherryPyServer(ServerAdapter):
     def run(self, handler): # pragma: no cover
-        from cherrypy import wsgiserver
+        depr("The wsgi server part of cherrypy was split into a new "
+             "project called 'cheroot'. Use the 'cheroot' server "
+             "adapter instead of cherrypy.")
+        from cherrypy import wsgiserver # This will fail for CherryPy >= 9
+
         self.options['bind_addr'] = (self.host, self.port)
         self.options['wsgi_app'] = handler
 
@@ -2815,6 +2831,25 @@ def run(self, handler): # pragma: no cover
             server.stop()
 
 
+class CherootServer(ServerAdapter):
+    def run(self, handler): # pragma: no cover
+        from cheroot import wsgi
+        from cheroot.ssl import builtin
+        self.options['bind_addr'] = (self.host, self.port)
+        self.options['wsgi_app'] = handler
+        certfile = self.options.pop('certfile', None)
+        keyfile = self.options.pop('keyfile', None)
+        chainfile = self.options.pop('chainfile', None)
+        server = wsgi.Server(**self.options)
+        if certfile and keyfile:
+            server.ssl_adapter = builtin.BuiltinSSLAdapter(
+                    certfile, keyfile, chainfile)
+        try:
+            server.start()
+        finally:
+            server.stop()
+
+
 class WaitressServer(ServerAdapter):
     def run(self, handler):
         from waitress import serve
@@ -2838,7 +2873,7 @@ def run(self, handler):
 
 
 class FapwsServer(ServerAdapter):
-    """ Extremely fast webserver using libev. See http://www.fapws.org/ """
+    """ Extremely fast webserver using libev. See https://github.com/william-os4y/fapws3 """
     def run(self, handler): # pragma: no cover
         import fapws._evwsgi as evwsgi
         from fapws import base, config
@@ -2982,7 +3017,9 @@ def run(self, handler):
 
 class AutoServer(ServerAdapter):
     """ Untested. """
-    adapters = [WaitressServer, PasteServer, TwistedServer, CherryPyServer, WSGIRefServer]
+    adapters = [WaitressServer, PasteServer, TwistedServer, CherryPyServer,
+                CherootServer, WSGIRefServer]
+
     def run(self, handler):
         for sa in self.adapters:
             try:
@@ -2996,6 +3033,7 @@ def run(self, handler):
     'wsgiref': WSGIRefServer,
     'waitress': WaitressServer,
     'cherrypy': CherryPyServer,
+    'cheroot': CherootServer,
     'paste': PasteServer,
     'fapws3': FapwsServer,
     'tornado': TornadoServer,
@@ -3451,7 +3489,7 @@ class StplParser(object):
     # Match the start tokens of code areas in a template
     _re_split = '(?m)^[ \t]*(\\\\?)((%(line_start)s)|(%(block_start)s))(%%?)'
     # Match inline statements (may contain python strings)
-    _re_inl = '(?m)%%(inline_start)s((?:%s|[^\'"\n]*?)+)%%(inline_end)s' % _re_inl
+    _re_inl = '(?m)%%(inline_start)s((?:%s|[^\'"\n])*?)%%(inline_end)s' % _re_inl
     _re_tok = '(?m)' + _re_tok
 
     default_syntax = '<% %> % {{ }}'
@@ -3653,7 +3691,7 @@ def wrapper(*args, **kwargs):
                 tplvars.update(result)
                 return template(tpl_name, **tplvars)
             elif result is None:
-                return template(tpl_name, defaults)
+                return template(tpl_name, **defaults)
             return result
         return wrapper
     return decorator

bottle.py

@@ -1,3 +1,44 @@
+python-bottle (0.12.25-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Federico Ceratto <[email protected]>  Sat, 28 Oct 2023 11:49:19 +0200
+
+python-bottle (0.12.23-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build-Depend on python3-wheel, for tox 4 support. (Closes: #1035694)
+
+ -- Stefano Rivera <[email protected]>  Fri, 11 Aug 2023 17:42:13 +0200
+
+python-bottle (0.12.23-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ James Addison ]
+  * d/patches: add 0004 to disable the local proxy for the tests. (Closes:
+    #1028743)
+
+ -- Louis-Philippe Véronneau <[email protected]>  Sun, 26 Feb 2023 15:59:44 -0500
+
+python-bottle (0.12.23-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Federico Ceratto <[email protected]>  Sat, 17 Sep 2022 11:37:25 +0100
+
+python-bottle (0.12.21-1) unstable; urgency=high
+
+  * New upstream release
+
+ -- Federico Ceratto <[email protected]>  Sat, 28 May 2022 14:25:15 +0100
+
+python-bottle (0.12.20-1) unstable; urgency=high
+
+  * New upstream release
+
+ -- Federico Ceratto <[email protected]>  Thu, 26 May 2022 19:00:01 +0100
+
 python-bottle (0.12.19-1) unstable; urgency=medium
 
   * New upstream release