*** doctest.py.~1~      Thu Feb  5 15:44:25 2004
--- doctest.py  Fri Feb 20 16:36:39 2004
***************
*** 798,803 ****

                  elif kind == "method":
!                     # value is already a function
!                     d[tag] = value

                  elif kind == "static method":
--- 798,804 ----

                  elif kind == "method":
!                     if not isinstance(value, super):
!                         # value is already a function
!                         d[tag] = value

                  elif kind == "static method":
***************
*** 937,941 ****
                      raise TypeError("Tester.run__test__: values in "
                              "dict must be strings, functions, methods, "
!                             "or classes; " + `v`)
                  failures = failures + f
                  tries = tries + t
--- 938,942 ----
                      raise TypeError("Tester.run__test__: values in "
                              "dict must be strings, functions, methods, "
!                             "or classes; " + k + ": " + `v`)
                  failures = failures + f
                  tries = tries + t