Merge pull request #516 from himikof/master

Fix python-webtest build with python 2.7
This commit is contained in:
Evgeny Egorochkin 2013-05-10 08:26:34 -07:00
commit b2f92ce250

View File

@ -4667,8 +4667,7 @@ pythonPackages = python.modules // rec {
md5 = "a1266d4db421963fd3deb172c6689e4b"; md5 = "a1266d4db421963fd3deb172c6689e4b";
}; };
buildInputs = [ pkgs.unzip ] ++ optionals isPy26 [ pythonPackages.ordereddict buildInputs = [ pkgs.unzip ] ++ optionals isPy26 [ pythonPackages.ordereddict ];
pythonPackages.unittest2 ];
# XXX: skipping two tests fails in python2.6 # XXX: skipping two tests fails in python2.6
doCheck = ! isPy26; doCheck = ! isPy26;
@ -4679,6 +4678,7 @@ pythonPackages = python.modules // rec {
six six
beautifulsoup4 beautifulsoup4
waitress waitress
unittest2
mock mock
pyquery pyquery
wsgiproxy2 wsgiproxy2