Merge lp://staging/~widelands-dev/widelands-website/wlwebsite_py36 into lp://staging/widelands-website
Proposed by
kaputtnik
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 540 | ||||||||
| Proposed branch: | lp://staging/~widelands-dev/widelands-website/wlwebsite_py36 | ||||||||
| Merge into: | lp://staging/widelands-website | ||||||||
| Diff against target: |
8078 lines (+2625/-2509) 141 files modified
README.txt (+11/-11) check_input/migrations/0001_initial.py (+1/-1) check_input/models.py (+1/-1) documentation/conf.py (+2/-2) documentation/management/commands/create_docs.py (+1/-1) local_settings.py.sample (+0/-2) mainpage/admin.py (+2/-2) mainpage/online_users_middleware.py (+1/-1) mainpage/settings.py (+15/-15) mainpage/sitemap_urls.py (+1/-1) mainpage/templatetags/wl_markdown.py (+8/-8) mainpage/urls.py (+1/-1) mainpage/utest/test_wl_markdown.py (+67/-67) mainpage/views.py (+7/-5) mainpage/wlwebsite_wsgi.py (+1/-1) news/migrations/0001_initial.py (+1/-1) news/migrations/0002_auto_20170417_1857.py (+1/-1) news/models.py (+4/-4) news/templatetags/news_extras.py (+2/-2) notification/engine.py (+5/-3) notification/lockfile.py (+3/-3) notification/migrations/0001_initial.py (+1/-1) notification/migrations/0002_auto_20170417_1857.py (+1/-1) notification/migrations/0003_auto_20190409_0924.py (+1/-1) notification/models.py (+14/-12) notification/views.py (+1/-1) privacy_policy/admin.py (+1/-1) privacy_policy/apps.py (+1/-1) privacy_policy/migrations/0001_initial.py (+1/-1) privacy_policy/models.py (+2/-2) privacy_policy/views.py (+1/-1) pybb/lib/phpserialize.py (+10/-10) pybb/management/__init__.py (+1/-1) pybb/management/commands/pybb_resave_post.py (+1/-1) pybb/management/pybb_notifications.py (+1/-1) pybb/markups/postmarkup.py (+125/-125) pybb/migrations/0001_initial.py (+1/-1) pybb/migrations/0002_auto_20161001_2046.py (+1/-1) pybb/migrations/0003_remove_post_user_ip.py (+1/-1) pybb/migrations/0004_auto_20181209_1334.py (+1/-1) pybb/migrations/0005_auto_20181221_1047.py (+1/-1) pybb/models.py (+8/-8) pybb/orm.py (+2/-2) pybb/templates/pybb/last_posts.html (+1/-1) pybb/templatetags/pybb_extras.py (+3/-3) pybb/util.py (+4/-4) pybb/views.py (+2/-2) python3.txt (+104/-0) threadedcomments/admin.py (+1/-1) threadedcomments/migrations/0001_initial.py (+1/-1) threadedcomments/migrations/0002_auto_20181003_1238.py (+1/-1) threadedcomments/models.py (+2/-2) threadedcomments/templatetags/gravatar.py (+10/-10) threadedcomments/templatetags/threadedcommentstags.py (+19/-19) threadedcomments/utils.py (+2/-2) threadedcomments/views.py (+1/-1) widelandslib/make_flow_diagram.py (+26/-26) widelandslib/test/test_conf.py (+1/-1) widelandslib/test/test_map.py (+3/-3) widelandslib/tribe.py (+13/-14) wiki/diff_match_patch.py (+1872/-1891) wiki/feeds.py (+2/-2) wiki/management.py (+1/-1) wiki/migrations/0001_initial.py (+1/-1) wiki/migrations/0002_auto_20161218_1056.py (+1/-1) wiki/migrations/0003_auto_20180918_0836.py (+1/-1) wiki/models.py (+28/-28) wiki/static/css/wiki.css (+13/-0) wiki/templatetags/restructuredtext.py (+1/-1) wiki/templatetags/wiki_extras.py (+2/-2) wiki/views.py (+2/-2) wlevents/admin.py (+1/-1) wlevents/migrations/0001_initial.py (+1/-1) wlevents/templatetags/wlevents_extras.py (+1/-1) wlevents/tests.py (+1/-1) wlggz/admin.py (+1/-1) wlggz/forms.py (+2/-2) wlggz/migrations/0001_initial.py (+1/-1) wlggz/migrations/0002_auto_20160805_2004.py (+1/-1) wlggz/urls.py (+1/-1) wlggz/views.py (+1/-1) wlhelp/management/commands/update_help.py (+37/-36) wlhelp/management/commands/update_help_pdf.py (+6/-6) wlhelp/migrations/0001_initial.py (+1/-1) wlhelp/migrations/0002_auto_20190410_1734.py (+1/-1) wlhelp/models.py (+11/-11) wlhelp/tests.py (+1/-1) wlhelp/urls.py (+1/-1) wlimages/admin.py (+2/-2) wlimages/forms.py (+1/-1) wlimages/migrations/0001_initial.py (+1/-1) wlimages/migrations/0002_remove_image_url.py (+1/-1) wlimages/migrations/0003_remove_image_editor_ip.py (+1/-1) wlimages/models.py (+1/-1) wlimages/templatetags/wlimages_extras.py (+3/-3) wlimages/tests.py (+4/-4) wlimages/urls.py (+1/-1) wlimages/views.py (+3/-3) wlmaps/admin.py (+1/-1) wlmaps/management.py (+1/-1) wlmaps/migrations/0001_initial.py (+1/-1) wlmaps/migrations/0002_auto_20181119_1855.py (+1/-1) wlmaps/models.py (+2/-2) wlmaps/tests/__init__.py (+2/-2) wlmaps/urls.py (+2/-2) wlmaps/views.py (+2/-2) wlpoll/admin.py (+1/-1) wlpoll/migrations/0001_initial.py (+1/-1) wlpoll/models.py (+3/-3) wlpoll/templatetags/wlpoll_extras.py (+3/-3) wlpoll/tests.py (+1/-1) wlpoll/urls.py (+1/-1) wlpoll/views.py (+1/-1) wlprofile/admin.py (+1/-1) wlprofile/fields.py (+4/-4) wlprofile/forms.py (+1/-1) wlprofile/gravatar.py (+6/-6) wlprofile/management/commands/profile_fetch_gravatars.py (+2/-2) wlprofile/migrations/0001_initial.py (+1/-1) wlprofile/migrations/0002_profile_deleted.py (+1/-1) wlprofile/models.py (+1/-1) wlprofile/templatetags/custom_date.py (+34/-19) wlprofile/templatetags/wlprofile_extras.py (+1/-1) wlprofile/tests.py (+6/-6) wlprofile/urls.py (+1/-1) wlprofile/views.py (+1/-1) wlscheduling/migrations/0001_initial.py (+1/-1) wlscheduling/urls.py (+1/-1) wlscheduling/views.py (+1/-1) wlscreens/admin.py (+1/-1) wlscreens/migrations/0001_initial.py (+1/-1) wlscreens/migrations/0002_auto_20190410_1737.py (+1/-1) wlscreens/models.py (+8/-9) wlscreens/tests/__init__.py (+2/-2) wlscreens/tests/test_models.py (+1/-1) wlscreens/urls.py (+2/-2) wlscreens/views.py (+1/-1) wlsearch/urls.py (+1/-1) wlsearch/views.py (+2/-2) wlwebchat/tests.py (+1/-1) wlwebchat/urls.py (+1/-1) |
||||||||
| To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands-website/wlwebsite_py36 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| GunChleoc | Approve | ||
|
Review via email:
|
|||
Commit message
Adapted code for use with python3.6
Description of the change
Changes need to get the website running with python 3.6. Because python2.7 is EOL in year 2020 i did not spend any time to make the code python2.7 compatible. So installing the website needs a virtualenvironment created with python 3.6.
Main changes (maybe interesting parts are linked):
- after running the python 2to3 script: https:/
- changes regarding to django (mostly replace __unicode__ with __str__)
- changes regarding str objects, which are bytes objects in python3
- same for replacing StringIo -> BytesIO when working with images
- added a python3 compatible version of diff_match_patch.py and applied individual coloring like it is right now
- fixed template filter 'minutes', renamed it to 'elapsed_time' and applied output of day(s), https:/
- the url /locale/ shows now also if the environment variable DISPLAY is set
- after installing on the new server the file README got the needed changes
The added text file 'python3.txt' contain my test results and can be removed if we finally merge this changes into trunk.
I want to merge this before i set up the productive website on the new server.
To post a comment you must log in.
Revision history for this message
| kaputtnik (franku) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Let's have it :)
We should document the test protocol in the Python3.txt file on our wiki too - it will come in useful for any big website changes that need testing on alpha.