Updates for Python 3 #722
Updates for Python 3 #722
Conversation
Upgrades code to be Python 3 compatible. Initial port using 2to3, then incremental pass over the code to correct issues discovered with failing unit tests. Also brought all Python requirements up to their latest version. Moved a copy of torndb (no long maintained) into the repository with a few updates for Python 3. Plan is to release this against a Ubutnu 22.04 LTS host and base Docker image for web/worker instances. This update also uses the latest nginx server, version 1.25.1.
| @@ -127,7 +127,7 @@ <h3>Cool Tools! Cool Tools!</h3> | |||
| <time datetime="{{sharedfile.created_at}}" title="{{sharedfile.feed_date()}}">{{sharedfile.pretty_created_at()}}</time> | |||
| </span> | |||
| </span> | |||
| {% if sharedfile.previous_sharedfile_id > 0 %} | |||
| {% if sharedfile.previous_sharedfile_id or 0 > 0 %} | |||
There was a problem hiding this comment.
Python 2 would evaluate None > 0 as False. But Python 3 throws an exception when comparing None with an int.
| @@ -19,7 +19,7 @@ | |||
| TEST_MODULES = [ | |||
| 'test.AccountTests', | |||
| 'test.CommentTests', | |||
| 'test.ExternalAccountTests', | |||
| # 'test.ExternalAccountTests', | |||
There was a problem hiding this comment.
We don't have Twitter API service now, so we don't need to test it.
| @@ -161,7 +161,7 @@ <h4>You have canceled your subscription, but it will remain active | |||
| {% end %} | |||
|
|
|||
| <h4>Your Membership Plan: <a href="/account/membership">{{ plan_name }}</a></h4> | |||
| {% if user.stripe_plan_id == "mltshp-double" and user.stripe_plan_rate > 24 %} | |||
| {% if user.stripe_plan_id == "mltshp-double" and user.stripe_plan_rate is not None and user.stripe_plan_rate > 24 %} | |||
There was a problem hiding this comment.
Another case where None was possibly compared with an int.
| @@ -134,6 +136,7 @@ def transcode_sharedfile(sharedfile_id): | |||
| animated = True | |||
| except EOFError: | |||
| pass | |||
| im.close() | |||
There was a problem hiding this comment.
I added some explicit close calls on handles to try to resolve some warnings during test execution. It didn't resolve everything, so I need to take a closer look, but there's no harm in doing these to my knowledge.
| if twitter_account: | ||
| via_twitter_account = " via @{0}".format(twitter_account['screen_name']) | ||
| api.update_status('https://mltshp.com/p/%s "%s"%s' % (sf['share_key'], title[:90], via_twitter_account)) | ||
| # The Twitter API is dead. |
| @@ -71,7 +71,7 @@ def make_zip_file(for_user=None): | |||
| extension = "png" | |||
|
|
|||
| if extension == "": | |||
| print(sf.content_type) | |||
| print((sf.content_type)) | |||
There was a problem hiding this comment.
I don't think these extra parenthesis are needed (they probably don't have any effect, either).
requirements-test.txt
Outdated
| coverage | ||
| coveralls | ||
| coverage==6.5.0 | ||
| coveralls==3.3.1 |
There was a problem hiding this comment.
There's a later version of coverage available, but 6.5.0 was the latest supported version for coveralls 3.3.1.
| base36_id=base36_id, | ||
| sharedfile_id=sharedfile_id, | ||
| since_id=since_id, | ||
| max_id=max_id, |
There was a problem hiding this comment.
Some leftover debugging code. These can be removed.
|
Debt jubilee! I got it running locally and the tests all pass. One thing that's just slightly weird with the way TIL about the |
|
Yeah, the logging is annoying for the tests and I'm not sure what is causing it. I'll try to disable it, since it's adding unnecessary noise (although it did turn out to be helpful in fixing that final test failure). |
Picker alt text
* Upgrades boto to boto3 * Some improvements to tests for reusing the database connection * Disabling tornado logging by default * Relocated fakes3 Dockerfile into project
Upgrades code to be Python 3 compatible. Initial port using 2to3, then incremental pass over the code to correct issues discovered with failing unit tests. Also brought all Python requirements up to their latest version. Moved a copy of torndb (no long maintained) into the repository with a few updates for Python 3.
Plan is to release this against a Ubutnu 22.04 LTS host and base Docker image for web/worker instances.
This update also uses the latest nginx server, version 1.25.1.
#554