[Pytest-commit] commit/tox: obestwalter: Merged in pjdelport/tox/fix-flakes (pull request #187)

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Mon Jun 20 10:44:24 EDT 2016


1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/365dc0ef97fd/
Changeset:   365dc0ef97fd
User:        obestwalter
Date:        2016-06-20 14:44:22+00:00
Summary:     Merged in pjdelport/tox/fix-flakes (pull request #187)

Make "tox -e flakes" pass
Affected #:  6 files

diff -r 73d3b0cabef07d45135b61848f86c17ebe3b13f9 -r 365dc0ef97fdf052ae258d73b0f0b4ac10c17ed5 doc/_getdoctarget.py
--- a/doc/_getdoctarget.py
+++ b/doc/_getdoctarget.py
@@ -13,4 +13,4 @@
     return ".".join(get_version_string().split(".")[:2])
 
 if __name__ == "__main__":
-    print (get_minor_version_string())
+    print(get_minor_version_string())

diff -r 73d3b0cabef07d45135b61848f86c17ebe3b13f9 -r 365dc0ef97fdf052ae258d73b0f0b4ac10c17ed5 tests/test_interpreters.py
--- a/tests/test_interpreters.py
+++ b/tests/test_interpreters.py
@@ -41,7 +41,7 @@
         if sys.platform == "win32":
             pydir = "python%s" % ver.replace(".", "")
             x = py.path.local("c:\%s" % pydir)
-            print (x)
+            print(x)
             if not x.check():
                 continue
         else:

diff -r 73d3b0cabef07d45135b61848f86c17ebe3b13f9 -r 365dc0ef97fdf052ae258d73b0f0b4ac10c17ed5 tox/_pytestplugin.py
--- a/tox/_pytestplugin.py
+++ b/tox/_pytestplugin.py
@@ -68,12 +68,12 @@
 
         def generic_report(*args, **kwargs):
             self._calls.append((name,) + args)
-            print ("%s" % (self._calls[-1], ))
+            print("%s" % (self._calls[-1], ))
         return generic_report
 
     def action(self, venv, msg, *args):
         self._calls.append(("action", venv, msg))
-        print ("%s" % (self._calls[-1], ))
+        print("%s" % (self._calls[-1], ))
         return Action(self.session, venv, msg, args)
 
     def getnext(self, cat):
@@ -319,7 +319,7 @@
         for p in base.visit(lambda x: x.check(file=1)):
             manifestlines.append("include %s" % p.relto(base))
         create_files(base, {"MANIFEST.in": "\n".join(manifestlines)})
-        print ("created project in %s" % (base,))
+        print("created project in %s" % (base,))
         base.chdir()
     return initproj
 

diff -r 73d3b0cabef07d45135b61848f86c17ebe3b13f9 -r 365dc0ef97fdf052ae258d73b0f0b4ac10c17ed5 tox/_quickstart.py
--- a/tox/_quickstart.py
+++ b/tox/_quickstart.py
@@ -119,7 +119,7 @@
         x = term_input(prompt)
         if default and not x:
             x = default
-        if sys.version_info < (3, ) and not isinstance(x, unicode):
+        if sys.version_info < (3, ) and not isinstance(x, unicode):  # noqa
             # for Python 2.x, try to get a Unicode string out of it
             if x.decode('ascii', 'replace').encode('ascii', 'replace') != x:
                 if TERM_ENCODING:

diff -r 73d3b0cabef07d45135b61848f86c17ebe3b13f9 -r 365dc0ef97fdf052ae258d73b0f0b4ac10c17ed5 tox/interpreters.py
--- a/tox/interpreters.py
+++ b/tox/interpreters.py
@@ -43,10 +43,10 @@
         try:
             res = exec_on_interpreter(info.executable,
                                       [inspect.getsource(sitepackagesdir),
-                                       "print (sitepackagesdir(%r))" % envdir])
+                                       "print(sitepackagesdir(%r))" % envdir])
         except ExecFailed:
             val = sys.exc_info()[1]
-            print ("execution failed: %s -- %s" % (val.out, val.err))
+            print("execution failed: %s -- %s" % (val.out, val.err))
             return ""
         else:
             return res["dir"]
@@ -56,7 +56,7 @@
     assert executable
     try:
         result = exec_on_interpreter(executable,
-                                     [inspect.getsource(pyinfo), "print (pyinfo())"])
+                                     [inspect.getsource(pyinfo), "print(pyinfo())"])
     except ExecFailed:
         val = sys.exc_info()[1]
         return NoInterpreterInfo(name, executable=val.executable,

diff -r 73d3b0cabef07d45135b61848f86c17ebe3b13f9 -r 365dc0ef97fdf052ae258d73b0f0b4ac10c17ed5 tox/result.py
--- a/tox/result.py
+++ b/tox/result.py
@@ -47,9 +47,9 @@
         pythonexecutable = py.path.local(pythonexecutable)
         out = pythonexecutable.sysexec("-c",
                                        "import sys; "
-                                       "print (sys.executable);"
-                                       "print (list(sys.version_info)); "
-                                       "print (sys.version)")
+                                       "print(sys.executable);"
+                                       "print(list(sys.version_info)); "
+                                       "print(sys.version)")
         lines = out.splitlines()
         executable = lines.pop(0)
         version_info = eval(lines.pop(0))

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

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


More information about the pytest-commit mailing list