diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2014-05-28 15:49:52 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-05-28 15:49:52 (GMT) |
commit | 12c575f2f6213478c29445e7092164227e125490 (patch) | |
tree | 63d2a42fde39b874cc6627807f61326633f64dd2 | |
parent | b49eff25b7af3398b44f1b5e8b29748948c22b69 (diff) | |
download | cpython-12c575f2f6213478c29445e7092164227e125490.zip cpython-12c575f2f6213478c29445e7092164227e125490.tar.gz cpython-12c575f2f6213478c29445e7092164227e125490.tar.bz2 |
Restore performance of some dumb database methods (regression introduced by #19385).
-rw-r--r-- | Lib/dbm/dumb.py | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/Lib/dbm/dumb.py b/Lib/dbm/dumb.py index 15dad9c..17854ee 100644 --- a/Lib/dbm/dumb.py +++ b/Lib/dbm/dumb.py @@ -216,8 +216,10 @@ class _Database(collections.MutableMapping): self._commit() def keys(self): - self._verify_open() - return list(self._index.keys()) + try: + return list(self._index) + except TypeError: + raise error('DBM object has already been closed') from None def items(self): self._verify_open() @@ -226,17 +228,26 @@ class _Database(collections.MutableMapping): def __contains__(self, key): if isinstance(key, str): key = key.encode('utf-8') - self._verify_open() - return key in self._index + try: + return key in self._index + except TypeError: + if self._index is None: + raise error('DBM object has already been closed') from None + else: + raise def iterkeys(self): - self._verify_open() - return iter(self._index.keys()) + try: + return iter(self._index) + except TypeError: + raise error('DBM object has already been closed') from None __iter__ = iterkeys def __len__(self): - self._verify_open() - return len(self._index) + try: + return len(self._index) + except TypeError: + raise error('DBM object has already been closed') from None def close(self): self._commit() |