Commit babbe16e authored by Arnaud Fontaine's avatar Arnaud Fontaine

erp5: py3: Use future egg API to install module aliases on Python2 for modules moved in Python3.

Also, patch future so that it does not use unicode_literals and str() as
unicode() because this breaks compatibility: all of this API (such as unquote()
from urllib, used in BusinessTemplate) used to return str(), not unicode().
parent e4e16940
This diff is collapsed.
...@@ -335,6 +335,7 @@ recipe = slapos.recipe.build:gitclone ...@@ -335,6 +335,7 @@ recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/erp5.git repository = https://lab.nexedi.com/nexedi/erp5.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
develop = true
[testrunner] [testrunner]
# XXX: Workaround for fact ERP5Type is not an distribution and does not # XXX: Workaround for fact ERP5Type is not an distribution and does not
...@@ -346,6 +347,8 @@ entry-points = ...@@ -346,6 +347,8 @@ entry-points =
runUnitTest=runUnitTest:main runUnitTest=runUnitTest:main
scripts = runUnitTest scripts = runUnitTest
initialization = initialization =
from future import standard_library
standard_library.install_aliases()
import glob, os, sys import glob, os, sys
import Products import Products
Products.__path__[:0] = filter(None, Products.__path__[:0] = filter(None,
...@@ -378,6 +381,8 @@ entry-points = ...@@ -378,6 +381,8 @@ entry-points =
runTestSuite=Products.ERP5Type.tests.runTestSuite:main runTestSuite=Products.ERP5Type.tests.runTestSuite:main
scripts = runTestSuite scripts = runTestSuite
initialization = initialization =
from future import standard_library
standard_library.install_aliases()
import os import os
import sys import sys
import Products import Products
...@@ -560,6 +565,9 @@ eggs = ${neoppod:eggs} ...@@ -560,6 +565,9 @@ eggs = ${neoppod:eggs}
strict-rfc3339 strict-rfc3339
jsonschema[format] jsonschema[format]
# py3
future
# parameterizing the version of the generated python interpreter name by the # parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the # python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance # installation of python, which we don't want on an instance
...@@ -590,6 +598,8 @@ python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/pyt ...@@ -590,6 +598,8 @@ python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/pyt
python-magic-patch-options = -p1 python-magic-patch-options = -p1
Zope2-patches = ${:_profile_base_location_}/../../component/egg-patch/Zope/PythonScript-2.13.patch#124c0d37394dd5020c6fd241ad75cc29 Zope2-patches = ${:_profile_base_location_}/../../component/egg-patch/Zope/PythonScript-2.13.patch#124c0d37394dd5020c6fd241ad75cc29
Zope2-patch-options = -p1 Zope2-patch-options = -p1
future-patches = ${:_profile_base_location_}/../../component/egg-patch/future/future-no-unicode-literals.patch#695a92b98c311431033207228208a7b0
future-patch-options = -p1
[eggs-all-scripts] [eggs-all-scripts]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -767,10 +777,12 @@ Beaker = 1.11.0 ...@@ -767,10 +777,12 @@ Beaker = 1.11.0
Mako = 1.1.4 Mako = 1.1.4
pyjwkest = 1.4.2 pyjwkest = 1.4.2
alabaster = 0.7.12 alabaster = 0.7.12
future = 0.18.2
pycryptodomex = 3.10.1 pycryptodomex = 3.10.1
strict-rfc3339 = 0.7 strict-rfc3339 = 0.7
webcolors = 1.10 webcolors = 1.10
rfc3987 = 1.3.8 rfc3987 = 1.3.8
jsonpointer = 2.2 jsonpointer = 2.2
# py3 support
future = 0.18.2+SlapOSPatched001
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment