Merge 3.5 (Issue #24669)

This commit is contained in:
Yury Selivanov 2015-07-21 19:04:22 +03:00
commit 8d603f1796
4 changed files with 8 additions and 1 deletions

View file

@ -66,3 +66,6 @@ class FesteringGob(MalodorousPervert, ParrotDroppings):
pass
def contradiction(self):
pass
async def lobbest(grenade):
pass

View file

@ -336,6 +336,7 @@ class TestRetrievingSourceCode(GetSourceBase):
def test_getfunctions(self):
functions = inspect.getmembers(mod, inspect.isfunction)
self.assertEqual(functions, [('eggs', mod.eggs),
('lobbest', mod.lobbest),
('spam', mod.spam)])
@unittest.skipIf(sys.flags.optimize >= 2,
@ -393,6 +394,7 @@ class TestRetrievingSourceCode(GetSourceBase):
def test_getsource(self):
self.assertSourceEqual(git.abuse, 29, 39)
self.assertSourceEqual(mod.StupidGit, 21, 50)
self.assertSourceEqual(mod.lobbest, 70, 71)
def test_getsourcefile(self):
self.assertEqual(normcase(inspect.getsourcefile(mod.spam)), modfile)