2 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/75a20d1bb563/
Changeset:   75a20d1bb563
Branch:      fix-fixturedef-merge
User:        bubenkoff
Date:        2013-11-13 18:25:55
Summary:     correctly check for fixturedef when  merging
Affected #:  1 file

diff -r 5d9ad221c1bef740a566bc9bc34055347a60b9dc -r 
75a20d1bb5639f79fc135b078385f367c8ef42f3 _pytest/python.py
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1555,7 +1555,7 @@
                     continue
                 fixturedefs = self.getfixturedefs(argname, parentid)
                 arg2fixturedefs[argname] = fixturedefs
-                if fixturedefs is not None:
+                if fixturedefs:
                     merge(fixturedefs[-1].argnames)
         return fixturenames_closure, arg2fixturedefs
 


https://bitbucket.org/hpk42/pytest/commits/979602dcb416/
Changeset:   979602dcb416
User:        hpk42
Date:        2013-11-14 05:58:50
Summary:     Merged in paylogic/pytest/fix-fixturedef-merge (pull request #86)

correctly check for fixturedef when  merging
Affected #:  1 file

diff -r 5d9ad221c1bef740a566bc9bc34055347a60b9dc -r 
979602dcb416e9b537e109cbe853a0ef3b9bfbbe _pytest/python.py
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1555,7 +1555,7 @@
                     continue
                 fixturedefs = self.getfixturedefs(argname, parentid)
                 arg2fixturedefs[argname] = fixturedefs
-                if fixturedefs is not None:
+                if fixturedefs:
                     merge(fixturedefs[-1].argnames)
         return fixturenames_closure, arg2fixturedefs

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit

Reply via email to