gluon/languages.py: import escape from html instead of cgi #2272
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import escape from html and fallback on current import from cgi to fix
the following build failure with python 3.8:
/home/buildroot/autobuild/run/instance-2/output-1/host/bin/python -c 'import os; os.chdir("/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2"); from gluon.main import save_password; save_password("web2py",8000)'
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/__init__.py", line 34, in <module>
from .globals import current
File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/globals.py", line 24, in <module>
from gluon.serializers import json, custom_json
File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/serializers.py", line 10, in <module>
from gluon.languages import lazyT
File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/languages.py", line 19, in <module>
from cgi import escape
ImportError: cannot import name 'escape' from 'cgi' (/home/buildroot/autobuild/run/instance-2/output-1/host/lib/python3.8/cgi.py)
Fixes:
- http://autobuild.buildroot.org/results/fa515627ae888d08fc10074e8d9f6e9dbede91a7
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #2272 +/- ##
==========================================
- Coverage 49.23% 47.87% -1.36%
==========================================
Files 43 43
Lines 16045 16041 -4
Branches 3752 3749 -3
==========================================
- Hits 7900 7680 -220
- Misses 7036 7219 +183
- Partials 1109 1142 +33 |
|
Fixed through eda8277 so I close this PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
import escape from html instead of cgi to fix the following build
failure with python 3.8:
Fixes:
Signed-off-by: Fabrice Fontaine fontaine.fabrice@gmail.com