Merged revisions 74459 via svnmerge from
commitdd973652455b42192cf417e82ba55dee2bb4acb5
authorbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Sat, 15 Aug 2009 13:25:28 +0000 (15 13:25 +0000)
committerbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Sat, 15 Aug 2009 13:25:28 +0000 (15 13:25 +0000)
treede8871faa6839a12a512e8d896860c5102be4758
parent4299f68afc1417f678e1ab9e05ba0b678abe9d0d
Merged revisions 74459 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74459 | benjamin.peterson | 2009-08-15 08:23:05 -0500 (Sat, 15 Aug 2009) | 9 lines

  Merged revisions 74457 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74457 | benjamin.peterson | 2009-08-15 08:16:38 -0500 (Sat, 15 Aug 2009) | 1 line

    #6707 fix a crash with dir() on an uninitialized module
  ........
................

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74460 6015fed2-1504-0410-9fe1-9d1591cc4771
Lib/test/test_module.py
Misc/NEWS
Objects/object.c