floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix python3 bugs 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-09-28 16:38:46 +02:00
parent 88915aa57d
commit 81ec29a597
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/_test/session.py
View File

@ -138,7 +138,7 @@ class Collection:
def getbyid(self, id): def getbyid(self, id):
""" return one or more nodes matching the id. """ """ return one or more nodes matching the id. """
names = filter(None, id.split("::")) names = [x for x in id.split("::") if x]
if names and '/' in names[0]: if names and '/' in names[0]:
names[:1] = names[0].split("/") names[:1] = names[0].split("/")
return self._match([self._topcollector], names) return self._match([self._topcollector], names)

2
testing/test_deprecated_api.py
View File

@ -170,10 +170,10 @@ class TestCollectDeprecated:
if path.basename == "testme.xxx": if path.basename == "testme.xxx":
return Module(path, parent=self) return Module(path, parent=self)
return super(Directory, self).consider_file(path) return super(Directory, self).consider_file(path)
""")
#def pytest_collect_file(path, parent): #def pytest_collect_file(path, parent):
# if path.basename == "testme.xxx": # if path.basename == "testme.xxx":
# return Module(path, parent=parent) # return Module(path, parent=parent)
""")
testme = testdir.makefile('xxx', testme="hello") testme = testdir.makefile('xxx', testme="hello")
config = testdir.parseconfig(testme) config = testdir.parseconfig(testme)
col = testdir.getnode(config, testme) col = testdir.getnode(config, testme)