*** ttest1.26	Sat Apr 06 16:34:56 2002
--- test_types.py Sat Apr 06 19:52:24 2002
***************
*** 476,481 ****
--- 476,496 ----
  except KeyError: pass
  else: raise TestFailed, "{}.popitem doesn't raise KeyError"
  
+ # Tests for popitem with specified key
+ d.clear()
+ k, v = 'abc', 'def'
+ d[k] = v
+ try: d.popitem('ghi')
+ except KeyError: pass
+ else: raise TestFailed, "{}.popitem(k) doesn't raise KeyError when k not in dictionary"
+ 
+ if d.popitem(k) != (k,v): raise TestFailed, "{}.popitem(k) doesn't find known key/value pair"
+ if len(d) > 0: raise TestFailed, "{}.popitem(k) failed to remove the specified pair"
+ 
+ try: d.popitem(k)
+ except KeyError: pass
+ else: raise TestFailed, "{}.popitem(k) doesn't raise KeyError when dictionary is empty"
+ 
  d[1] = 1
  try:
      for i in d: