merge

_pytest/config.py

@@ -4,7 +4,7 @@ import py
 import sys, os
 from _pytest.core import PluginManager
 import pytest
-from _argcomplete import try_argcomplete, filescompleter
+from _pytest._argcomplete import try_argcomplete, filescompleter
 
 # enable after some grace period for plugin writers
 TYPE_WARN = False

testing/test_parseopt.py

@@ -196,7 +196,7 @@ def test_argcomplete(testdir, monkeypatch):
     monkeypatch.setenv('COMP_LINE', "py.test " + arg)
     monkeypatch.setenv('COMP_POINT', str(len("py.test " + arg)))
     result = testdir.run('bash', str(script), arg)
-    print dir(result), result.ret
+    #print dir(result), result.ret
     if result.ret == 255:
         # argcomplete not found
         pytest.skip("argcomplete not available")