Merge pull request #387 from ColinDuquesnoy/py34

UnicodeError with Python 3.4
This commit is contained in:
Dave Halter
2014-03-21 18:42:21 +04:30
3 changed files with 10 additions and 2 deletions

View File

@@ -4,6 +4,7 @@ env:
- TOXENV=py27
- TOXENV=py32
- TOXENV=py33
- TOXENV=py34
- TOXENV=pypy
- TOXENV=cov
- TOXENV=sith
@@ -14,6 +15,12 @@ matrix:
- env: TOXENV=pypy
install:
- pip install --quiet --use-mirrors tox
# install python 3.4 from PPA since Travis does not have python 3.4 yet
- if [ "$TOXENV" = "py34" ]; then
sudo apt-add-repository -y ppa:fkrull/deadsnakes;
sudo apt-get update;
sudo apt-get install python3.4;
fi
script:
- tox
after_script:

View File

@@ -31,7 +31,8 @@ def find_module_py33(string, path=None):
module_file = None
else:
module_path = loader.get_filename(string)
mode = 'rb' if module_path.endswith(".pyc") else 'r'
module_ext = os.path.splitext(module_path)[1]
mode = 'rb' if module_ext in ['.pyc', '.so', '.pyd'] else 'r'
module_file = open(module_path, mode)
except AttributeError:
# ExtensionLoader has not attribute get_filename, instead it has a

View File

@@ -1,5 +1,5 @@
[tox]
envlist = py26, py27, py32, py33
envlist = py26, py27, py32, py33, py34
[testenv]
deps =
https://bitbucket.org/hpk42/pytest/get/c4f58165e0d4.zip