Upgrade to Python3 and disable the old admin interface #3027
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
sbrunner
changed the title
pvalsecc
approved these changes
Aug 11, 2017
docker/build/Dockerfile
Outdated
| @@ -1,4 +1,4 @@ | |||
| FROM python:2 | |||
| FROM python:3 | |||
There was a problem hiding this comment.
Because 3.6 is not available on Debian stable, and we want the same version every where :-)
docker/build/Dockerfile
Outdated
| @@ -25,6 +25,6 @@ COPY run /usr/bin/ | |||
|
|
|||
| WORKDIR /src | |||
|
|
|||
| ENV PYTHONPATH /build/venv/lib/python2.7/site-packages/ | |||
| ENV PYTHONPATH /build/venv/lib/python3.6/site-packages/ | |||
c2cgeoportal/scripts/urllogin.py
Outdated
| @@ -46,10 +47,11 @@ def create_token(aeskey, user, password, valid): | |||
| exit(1) | |||
| cipher = AES.new(aeskey) | |||
| data = json.dumps(auth) | |||
| print(type(data)) | |||
c2cgeoportal/views/entry.py
Outdated
| @@ -240,6 +240,7 @@ def _wms_getcap_cached(self, url, auth, role_id): | |||
|
|
|||
| try: | |||
| resp, content = http.request(url, method="GET", headers=headers) | |||
| content.decode("utf-8") | |||
c2cgeoportal/views/entry.py
Outdated
| @@ -1133,6 +1134,7 @@ def _external_themes_role(self, interface, role_id): # pragma nocover | |||
|
|
|||
| try: | |||
| resp, content = http.request(ext_url, method="GET", headers=headers) | |||
| content.decode("utf-8") | |||
Disable api and related language checks
sbrunner
force-pushed
the
python3
branch
4 times, most recently
from
1c09371
to
dbc3f0e
Compare
sbrunner
force-pushed
the
python3
branch
2 times, most recently
from
bb0eaf1
to
69c9499
Compare
fredj
changed the title
fredj
reviewed
Aug 14, 2017
c2cgeoportal/lib/__init__.py
Outdated
| @@ -220,23 +221,19 @@ def get_typed(name, value, types, request, errors): | |||
|
|
|||
|
|
|||
| def add_url_params(url, params): | |||
| if len(params.items()) == 0: | |||
| if len(list(params.items())) == 0: | |||
There was a problem hiding this comment.
can be simplified to if len(params) == 0:
fredj
approved these changes
Aug 14, 2017
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.
No description provided.