[Pytest-commit] commit/pytest: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/887225d5a16d/
Changeset:   887225d5a16d
User:        hpk42
Date:        2013-10-01 22:39:23
Summary:     add to CHANGELOG
Affected #:  1 file

diff -r 6720c03fd0dafceda84710d6958bf5f6708bb032 -r 887225d5a16d46df2cbf3526b6c060faa54f8b82 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,11 @@
 
 - fix issue360: When using parser.addoption() unicode arguments to the
   "type" keyword should also be converted to the respective types.
+  thanks Floris Bruynooghe.
+
+- fix issue361: fix filename completion when using argcomplete 
+  thanks Anthon van der Neuth.
+  
 
 Changes between 2.3.5 and 2.4
 -----------------------------------


https://bitbucket.org/hpk42/pytest/commits/1dd933cfa077/
Changeset:   1dd933cfa077
User:        hpk42
Date:        2013-10-02 07:49:11
Summary:     merge
Affected #:  2 files

diff -r 887225d5a16d46df2cbf3526b6c060faa54f8b82 -r 1dd933cfa0777413ea70c1cd7a98c5514222f43f _pytest/_argcomplete.py
--- a/_pytest/_argcomplete.py
+++ b/_pytest/_argcomplete.py
@@ -74,9 +74,13 @@
         else:
             prefix_dir = 0
         completion = []
+        globbed = []
         if '*' not in prefix and '?' not in prefix:
+            if prefix[-1] == os.path.sep:  # we are on unix, otherwise no bash
+                globbed.extend(glob(prefix + '.*'))
             prefix += '*'
-        for x in sorted(glob(prefix)):
+        globbed.extend(glob(prefix))
+        for x in sorted(globbed):
             if os.path.isdir(x):
                 x += '/'
             # append stripping the prefix (like bash, not like compgen)

diff -r 887225d5a16d46df2cbf3526b6c060faa54f8b82 -r 1dd933cfa0777413ea70c1cd7a98c5514222f43f doc/en/skipping.txt
--- a/doc/en/skipping.txt
+++ b/doc/en/skipping.txt
@@ -183,7 +183,7 @@
 ---------------------------
 
 It is possible to apply markers like skip and xfail to individual
-test instances when using parametrize:
+test instances when using parametrize::
 
      import pytest
 
@@ -191,7 +191,7 @@
          (1, 2),
 	 pytest.mark.xfail((1, 0)),
 	 pytest.mark.xfail(reason="some bug")((1, 3)),
-	 (2, 3),
+         (2, 3),
          (3, 4),
          (4, 5),
          pytest.mark.skipif("sys.version_info >= (3,0)")((10, 11)),

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.