Index: Lib/shelve.py =================================================================== --- Lib/shelve.py (revision 65186) +++ Lib/shelve.py (working copy) @@ -73,6 +73,19 @@ __all__ = ["Shelf","BsdDbShelf","DbfilenameShelf","open"] +class _ClosedDict(UserDict.DictMixin): + 'Marker for a closed dict. Access attempts raise a ValueError.' + + def closed(self, *args): + raise ValueError('invalid operation on closed shelf') + __getitem__ = __setitem__ = __delitem__ = keys = closed + + def __repr__(self): + return '<%s object at %s>' % (self.__class__.__name__, hex(id(self))) + + def close(self): + pass + class Shelf(UserDict.DictMixin): """Base class for shelf implementations. @@ -136,7 +149,7 @@ self.dict.close() except AttributeError: pass - self.dict = 0 + self.dict = _ClosedDict() def __del__(self): if not hasattr(self, 'writeback'): Index: Lib/test/test_shelve.py =================================================================== --- Lib/test/test_shelve.py (revision 65186) +++ Lib/test/test_shelve.py (working copy) @@ -8,6 +8,21 @@ fn = "shelftemp" + os.extsep + "db" + def test_close(self): + d1 = {} + s = shelve.Shelf(d1, protocol=2, writeback=False) + s['key1'] = [1,2,3,4] + self.assertEqual(s['key1'], [1,2,3,4]) + self.assertEqual(len(s), 1) + s.close() + self.assertRaises(ValueError, len, s) + try: + s['key1'] + except ValueError: + pass + else: + self.fail('Closed shelf should not find a key') + def test_ascii_file_shelf(self): try: s = shelve.open(self.fn, protocol=0)