[py-svn] r36994 - in py/branch/config/py/test: . terminal
fijal at codespeak.net
fijal at codespeak.net
Fri Jan 19 15:08:20 CET 2007
Author: fijal
Date: Fri Jan 19 15:08:16 2007
New Revision: 36994
Modified:
py/branch/config/py/test/collect.py
py/branch/config/py/test/config.py
py/branch/config/py/test/terminal/terminal.py
Log:
removal of some trailing white-spaces.
Modified: py/branch/config/py/test/collect.py
==============================================================================
--- py/branch/config/py/test/collect.py (original)
+++ py/branch/config/py/test/collect.py Fri Jan 19 15:08:16 2007
@@ -342,15 +342,15 @@
d[name] = res
return d
- def makeitem(self, name, obj, usefilters=True):
+ def makeitem(self, name, obj, usefilters=True):
if (not usefilters or self.classnamefilter(name)) and \
- py.std.inspect.isclass(obj):
- return self.Class(name, parent=self)
+ py.std.inspect.isclass(obj):
+ return self.Class(name, parent=self)
elif (not usefilters or self.funcnamefilter(name)) and callable(obj):
if obj.func_code.co_flags & 32: # generator function
- return self.Generator(name, parent=self)
+ return self.Generator(name, parent=self)
else:
- return self.Function(name, parent=self)
+ return self.Function(name, parent=self)
def _prepare(self):
if not hasattr(self, '_name2items'):
Modified: py/branch/config/py/test/config.py
==============================================================================
--- py/branch/config/py/test/config.py (original)
+++ py/branch/config/py/test/config.py Fri Jan 19 15:08:16 2007
@@ -49,7 +49,7 @@
cmdlineoption, remaining = self._parser.parse_args(args)
self.option.__dict__.update(vars(cmdlineoption))
fixoptions(self.option) # XXX fixing should be moved to sessions
- if not remaining:
+ if not remaining:
remaining.append(py.std.os.getcwd())
self.remaining = remaining
Modified: py/branch/config/py/test/terminal/terminal.py
==============================================================================
--- py/branch/config/py/test/terminal/terminal.py (original)
+++ py/branch/config/py/test/terminal/terminal.py Fri Jan 19 15:08:16 2007
@@ -146,7 +146,7 @@
self.out.line("test target: %s" %(x.fspath,))
conftestmodules = self.config.conftest.getconftestmodules(None)
- for i,x in py.builtin.enumerate(conftestmodules):
+ for i,x in py.builtin.enumerate(conftestmodules):
self.out.line("initial conf %d: %s" %(i, x.__file__))
#for i, x in py.builtin.enumerate(py.test.config.configpaths):
More information about the pytest-commit
mailing list