aboutsummaryrefslogtreecommitdiff
path: root/python/tox.ini
diff options
context:
space:
mode:
authorDan O'Reilly <oreilldf@gmail.com>2015-08-26 20:30:41 -0400
committerDan O'Reilly <oreilldf@gmail.com>2015-08-31 16:42:31 -0400
commitd9598ca55db13bcbc8c748ed7a517f12a069962a (patch)
treef836b2757cb6e5cd223827ffceeff2c24eb87f06 /python/tox.ini
parent0087da9d4775f79c67362cc89c653f3a33a9bae2 (diff)
downloadprotobuf-d9598ca55db13bcbc8c748ed7a517f12a069962a.tar.gz
protobuf-d9598ca55db13bcbc8c748ed7a517f12a069962a.tar.bz2
protobuf-d9598ca55db13bcbc8c748ed7a517f12a069962a.zip
Fix Python 3.4 cpp implementation
Fixes the ScalarMapContainer/MessageMapContainer implementations on Python 3.4, by dynamically allocating their PyTypeObjects using PyType_FromSpecWithBases, instead of statically allocating them. This is necessary because Python 3.4+ disallows statically allocating a class with a dynamically allocated parent. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Diffstat (limited to 'python/tox.ini')
-rw-r--r--python/tox.ini3
1 files changed, 1 insertions, 2 deletions
diff --git a/python/tox.ini b/python/tox.ini
index d0100758..a6352ef4 100644
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -2,8 +2,7 @@
envlist =
# cpp implementation on py34 is currently broken due to
# changes introduced by http://bugs.python.org/issue22079.
- #py{26,27,33,34}-{cpp,python}
- py{26,27,33}-{cpp,python}, py34-{python}
+ py{26,27,33,34}-{cpp,python}
[testenv]
usedevelop=true