1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/07e63ecf9c17/ changeset: 07e63ecf9c17 user: hpk42 date: 2012-06-21 11:20:29 summary: fix some pep8 issues, more to go ... is there a tool that helps with pep8-ifying? affected #: 6 files diff -r 6b8f9ccbaa284ea7d466d9b2fab4a5bf81872876 -r 07e63ecf9c174c05d81344f67e22f047a7a6e541 _pytest/assertion/oldinterpret.py --- a/_pytest/assertion/oldinterpret.py +++ b/_pytest/assertion/oldinterpret.py @@ -526,10 +526,13 @@ # example: def f(): return 5 + def g(): return 3 + def h(x): return 'never' + check("f() * g() == 5") check("not f()") check("not (f() and g() or 0)") diff -r 6b8f9ccbaa284ea7d466d9b2fab4a5bf81872876 -r 07e63ecf9c174c05d81344f67e22f047a7a6e541 _pytest/assertion/reinterpret.py --- a/_pytest/assertion/reinterpret.py +++ b/_pytest/assertion/reinterpret.py @@ -44,4 +44,3 @@ from _pytest.assertion.newinterpret import interpret as reinterpret else: reinterpret = reinterpret_old - diff -r 6b8f9ccbaa284ea7d466d9b2fab4a5bf81872876 -r 07e63ecf9c174c05d81344f67e22f047a7a6e541 _pytest/assertion/rewrite.py --- a/_pytest/assertion/rewrite.py +++ b/_pytest/assertion/rewrite.py @@ -95,7 +95,8 @@ finally: self.session = sess else: - state.trace("matched test file (was specified on cmdline): %r" % (fn,)) + state.trace("matched test file (was specified on cmdline): %r" % + (fn,)) # The requested module looks like a test file, so rewrite it. This is # the most magical part of the process: load the source, rewrite the # asserts, and load the rewritten source. We also cache the rewritten @@ -121,14 +122,14 @@ # because we're in a zip file. write = False elif e == errno.EACCES: - state.trace("read only directory: %r" % (fn_pypath.dirname,)) + state.trace("read only directory: %r" % fn_pypath.dirname) write = False else: raise cache_name = fn_pypath.basename[:-3] + PYC_TAIL pyc = os.path.join(cache_dir, cache_name) - # Notice that even if we're in a read-only directory, I'm going to check - # for a cached pyc. This may not be optimal... + # Notice that even if we're in a read-only directory, I'm going + # to check for a cached pyc. This may not be optimal... co = _read_pyc(fn_pypath, pyc) if co is None: state.trace("rewriting %r" % (fn,)) @@ -160,10 +161,11 @@ return sys.modules[name] def _write_pyc(co, source_path, pyc): - # Technically, we don't have to have the same pyc format as (C)Python, since - # these "pycs" should never be seen by builtin import. However, there's - # little reason deviate, and I hope sometime to be able to use - # imp.load_compiled to load them. (See the comment in load_module above.) + # Technically, we don't have to have the same pyc format as + # (C)Python, since these "pycs" should never be seen by builtin + # import. However, there's little reason deviate, and I hope + # sometime to be able to use imp.load_compiled to load them. (See + # the comment in load_module above.) mtime = int(source_path.mtime()) try: fp = open(pyc, "wb") @@ -240,9 +242,8 @@ except EnvironmentError: return None # Check for invalid or out of date pyc file. - if (len(data) != 8 or - data[:4] != imp.get_magic() or - struct.unpack("<l", data[4:])[0] != mtime): + if (len(data) != 8 or data[:4] != imp.get_magic() or + struct.unpack("<l", data[4:])[0] != mtime): return None co = marshal.load(fp) if not isinstance(co, types.CodeType): @@ -280,35 +281,35 @@ unary_map = { - ast.Not : "not %s", - ast.Invert : "~%s", - ast.USub : "-%s", - ast.UAdd : "+%s" + ast.Not: "not %s", + ast.Invert: "~%s", + ast.USub: "-%s", + ast.UAdd: "+%s" } binop_map = { - ast.BitOr : "|", - ast.BitXor : "^", - ast.BitAnd : "&", - ast.LShift : "<<", - ast.RShift : ">>", - ast.Add : "+", - ast.Sub : "-", - ast.Mult : "*", - ast.Div : "/", - ast.FloorDiv : "//", - ast.Mod : "%%", # escaped for string formatting - ast.Eq : "==", - ast.NotEq : "!=", - ast.Lt : "<", - ast.LtE : "<=", - ast.Gt : ">", - ast.GtE : ">=", - ast.Pow : "**", - ast.Is : "is", - ast.IsNot : "is not", - ast.In : "in", - ast.NotIn : "not in" + ast.BitOr: "|", + ast.BitXor: "^", + ast.BitAnd: "&", + ast.LShift: "<<", + ast.RShift: ">>", + ast.Add: "+", + ast.Sub: "-", + ast.Mult: "*", + ast.Div: "/", + ast.FloorDiv: "//", + ast.Mod: "%%", # escaped for string formatting + ast.Eq: "==", + ast.NotEq: "!=", + ast.Lt: "<", + ast.LtE: "<=", + ast.Gt: ">", + ast.GtE: ">=", + ast.Pow: "**", + ast.Is: "is", + ast.IsNot: "is not", + ast.In: "in", + ast.NotIn: "not in" } @@ -341,7 +342,7 @@ lineno = 0 for item in mod.body: if (expect_docstring and isinstance(item, ast.Expr) and - isinstance(item.value, ast.Str)): + isinstance(item.value, ast.Str)): doc = item.value.s if "PYTEST_DONT_REWRITE" in doc: # The module has disabled assertion rewriting. @@ -462,7 +463,8 @@ body.append(raise_) # Clear temporary variables by setting them to None. if self.variables: - variables = [ast.Name(name, ast.Store()) for name in self.variables] + variables = [ast.Name(name, ast.Store()) + for name in self.variables] clear = ast.Assign(variables, ast.Name("None", ast.Load())) self.statements.append(clear) # Fix line numbers. @@ -548,7 +550,8 @@ new_kwarg, expl = self.visit(call.kwargs) arg_expls.append("**" + expl) expl = "%s(%s)" % (func_expl, ', '.join(arg_expls)) - new_call = ast.Call(new_func, new_args, new_kwargs, new_star, new_kwarg) + new_call = ast.Call(new_func, new_args, new_kwargs, + new_star, new_kwarg) res = self.assign(new_call) res_expl = self.explanation_param(self.display(res)) outer_expl = "%s\n{%s = %s\n}" % (res_expl, res_expl, expl) diff -r 6b8f9ccbaa284ea7d466d9b2fab4a5bf81872876 -r 07e63ecf9c174c05d81344f67e22f047a7a6e541 _pytest/assertion/util.py --- a/_pytest/assertion/util.py +++ b/_pytest/assertion/util.py @@ -116,9 +116,7 @@ excinfo = py.code.ExceptionInfo() explanation = ['(pytest_assertion plugin: representation of ' 'details failed. Probably an object has a faulty __repr__.)', - str(excinfo) - ] - + str(excinfo)] if not explanation: return None diff -r 6b8f9ccbaa284ea7d466d9b2fab4a5bf81872876 -r 07e63ecf9c174c05d81344f67e22f047a7a6e541 _pytest/main.py --- a/_pytest/main.py +++ b/_pytest/main.py @@ -133,8 +133,10 @@ def __init__(self, fspath, config): self.fspath = fspath self.config = config + def __getattr__(self, name): hookmethod = getattr(self.config.hook, name) + def call_matching_hooks(**kwargs): plugins = self.config._getmatchingplugins(self.fspath) return hookmethod.pcall(plugins, **kwargs) @@ -143,8 +145,9 @@ def compatproperty(name): def fget(self): return getattr(pytest, name) + return property(fget, None, None, - "deprecated attribute %r, use pytest.%s" % (name,name)) + "deprecated attribute %r, use pytest.%s" % (name, name)) class Node(object): """ base class for all Nodes in the collection tree. @@ -184,7 +187,8 @@ return cls def __repr__(self): - return "<%s %r>" %(self.__class__.__name__, getattr(self, 'name', None)) + return "<%s %r>" %(self.__class__.__name__, + getattr(self, 'name', None)) # methods for ordering nodes @property @@ -201,8 +205,8 @@ def __eq__(self, other): if not isinstance(other, Node): return False - return self.__class__ == other.__class__ and \ - self.name == other.name and self.parent == other.parent + return (self.__class__ == other.__class__ and + self.name == other.name and self.parent == other.parent) def __ne__(self, other): return not self == other @@ -371,7 +375,8 @@ def __init__(self, config): super(Session, self).__init__(py.path.local(), parent=None, config=config, session=self) - assert self.config.pluginmanager.register(self, name="session", prepend=True) + assert self.config.pluginmanager.register( + self, name="session", prepend=True) self._testsfailed = 0 self.shouldstop = False self.trace = config.trace.root.get("collection") @@ -457,7 +462,7 @@ if path.check(dir=1): assert not names, "invalid arg %r" %(arg,) for path in path.visit(fil=lambda x: x.check(file=1), - rec=self._recurse, bf=True, sort=True): + rec=self._recurse, bf=True, sort=True): for x in self._collectfile(path): yield x else: @@ -469,13 +474,13 @@ ihook = self.gethookproxy(path) if not self.isinitpath(path): if ihook.pytest_ignore_collect(path=path, config=self.config): - return () + return () return ihook.pytest_collect_file(path=path, parent=self) def _recurse(self, path): ihook = self.gethookproxy(path.dirpath()) if ihook.pytest_ignore_collect(path=path, config=self.config): - return + return for pat in self._norecursepatterns: if path.check(fnmatch=pat): return False diff -r 6b8f9ccbaa284ea7d466d9b2fab4a5bf81872876 -r 07e63ecf9c174c05d81344f67e22f047a7a6e541 tox.ini --- a/tox.ini +++ b/tox.ini @@ -77,4 +77,4 @@ python_files=test_*.py *_test.py python_classes=Test Acceptance python_functions=test -pep8ignore = E401 E225 E261 E128 E124 +pep8ignore = E401 E225 E261 E128 E124 E302 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. _______________________________________________ py-svn mailing list py-svn@codespeak.net http://codespeak.net/mailman/listinfo/py-svn
