Your message dated Wed, 13 Oct 2010 10:58:14 +0200 with message-id <4CB574A6.2050608@dogguy.org> and subject line Re: Bug#600018: Pre-upload approval for python-bottle/0.8.4-1 has caused the Debian Bug report #600018, regarding unblock: python-bottle/0.8.4-1 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 600018: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=600018 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: Pre-upload approval for python-bottle/0.8.4-1
- From: David Paleino <dapal@debian.org>
- Date: Tue, 12 Oct 2010 22:46:15 +0200
- Message-id: <[🔎] 20101012224615.475cebdb@pingu>
- Reply-to: dapal@debian.org
Package: release.debian.org Severity: normal Hello RT, I have a new upstream version of python-bottle (0.8.4, currently 0.8.2-1 in sid and 0.8.3-1 in experimental), which fixes a couple of bugs. Not much important, but would be nice to have them pushed in Squeeze, since the fixes are tiny and cause no harm, even if they don't meet the freeze criteria. I'm attaching a "git diff" from the tagged debian/0.8.2-1. Would such an upload be unblocked? Thank you for your work, David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 ----|---- http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174diff --git a/apidoc/changelog.rst b/apidoc/changelog.rst index db36a54..776e03e 100755 --- a/apidoc/changelog.rst +++ b/apidoc/changelog.rst @@ -5,6 +5,15 @@ Release Notes and Changelog =========================== +Bugfix Release 0.8.4 +===================== + +* Fixed "Using DictMixins with the @view decorator" (Issue #102 and #103) + +Bugfix Release 0.8.3 +===================== + +* Fixed "Reloading server dies on slow hardware." (Issue #90) Bugfix Release 0.8.2 ===================== diff --git a/bottle.py b/bottle.py index 7b7ae07..8a7cae4 100755 --- a/bottle.py +++ b/bottle.py @@ -62,7 +62,7 @@ This is an example:: from __future__ import with_statement __author__ = 'Marcel Hellkamp' -__version__ = '0.8.2' +__version__ = '0.8.4' __license__ = 'MIT' import base64 @@ -1432,7 +1432,7 @@ class FileCheckerThread(threading.Thread): self.status = 3 if not exists(self.lockfile): self.status = 2 - elif mtime(self.lockfile) < time.time() - self.interval * 2: + elif mtime(self.lockfile) < time.time() - self.interval - 5: self.status = 1 if not self.status: time.sleep(self.interval) @@ -1806,7 +1806,7 @@ def view(tpl_name, **defaults): @functools.wraps(func) def wrapper(*args, **kwargs): result = func(*args, **kwargs) - if isinstance(result, dict): + if isinstance(result, (dict, DictMixin)): tplvars = defaults.copy() tplvars.update(result) return template(tpl_name, **tplvars) diff --git a/debian/changelog b/debian/changelog index 09cfb5e..713036a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +python-bottle (0.8.4-1) UNRELEASED; urgency=low + + * New upstream version + + -- David Paleino <dapal@debian.org> Tue, 12 Oct 2010 22:09:37 +0200 + +python-bottle (0.8.3-1) experimental; urgency=low + + * New upstream version + * Upload to experimental, since we're in hard Squeeze freeze now. + + -- David Paleino <dapal@debian.org> Sun, 05 Sep 2010 07:52:39 +0200 + python-bottle (0.8.2-1) unstable; urgency=low * New upstream versionAttachment: signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
- To: David Paleino <dapal@debian.org>
- Cc: 600018-done@bugs.debian.org
- Subject: Re: Bug#600018: Pre-upload approval for python-bottle/0.8.4-1
- From: Mehdi Dogguy <mehdi@dogguy.org>
- Date: Wed, 13 Oct 2010 10:58:14 +0200
- Message-id: <4CB574A6.2050608@dogguy.org>
- In-reply-to: <[🔎] 20101013105855.0eb4780b@pingu>
- References: <[🔎] 20101012224615.475cebdb@pingu> <[🔎] 4CB561FA.6080407@dogguy.org> <[🔎] 20101013105855.0eb4780b@pingu>
On 10/13/2010 10:58 AM, David Paleino wrote: > > Package accepted, requesting unblock. > Unblocked. Regards, -- Mehdi Dogguy مهدي الدڤي http://dogguy.org/
--- End Message ---