Skip to content

Commit

Permalink
Merge branch '0.8-maintenance'
Browse files Browse the repository at this point in the history
  • Loading branch information
mitsuhiko committed Sep 29, 2011
2 parents 409ed22 + c99095c commit c0999e7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
9 changes: 9 additions & 0 deletions CHANGES
Expand Up @@ -6,6 +6,15 @@ Version 0.9

Relase date to be decided, codename to be chosen.

Version 0.8.1
-------------

(bugfix release, release date to be announced)

- Fixed an issue with the memcache not working properly.
- Fixed an issue for Python 2.7.1 and higher that broke
copying of multidicts with :func:`copy.copy`.

Version 0.8
-----------

Expand Down
2 changes: 1 addition & 1 deletion werkzeug/contrib/cache.py
Expand Up @@ -304,7 +304,7 @@ def __init__(self, servers=None, default_timeout=300, key_prefix=None):
if servers is None:
servers = ['127.0.0.1:11211']
self._client = self.import_preferred_memcache_lib(servers)
if self.client is None:
if self._client is None:
raise RuntimeError('no memcache module found')
else:
# NOTE: servers is actually an already initialized memcache
Expand Down
3 changes: 3 additions & 0 deletions werkzeug/datastructures.py
Expand Up @@ -583,6 +583,9 @@ def popitemlist(self):
except KeyError, e:
raise BadRequestKeyError(str(e))

def __copy__(self):
return self.copy()

def __repr__(self):
return '%s(%r)' % (self.__class__.__name__, self.items(multi=True))

Expand Down

0 comments on commit c0999e7

Please sign in to comment.