Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP - Python3 import cleanup #2887

Closed
wants to merge 84 commits into from
Closed

WIP - Python3 import cleanup #2887

wants to merge 84 commits into from

Conversation

tfmorris
Copy link
Contributor

Closes #

Technical

Testing

Evidence

Stakeholders

cclauss and others added 30 commits September 28, 2019 22:11
@cclauss
requirements_common.txt: Upgrade to web.py==0.40
133c930
@cclauss
Rebase
93ea4fe
@cclauss
Python 3.8, not 3.7
2ebc1c8
@cclauss
fixup! web.utf8 -> web.safestr
3d4bdea
@cclauss
Revert the changes to .travis.yml
450cff2 
Too complicated to get reviewed.
@cclauss
pushd vendor/infogami && git pull origin master && popd;
58c608e
@cclauss
pyenv install 2.7.14;
344b4b3
@cclauss
Fix npm/node workaround
68fe5ee
@cclauss
from infogami.utils.flash import add_flash_message
c1db712
@cclauss
from infogami.utils.flash import add_flash_message
b9ce992
@cclauss
from infogami.utils.flash import add_flash_message
6958bc2
@cclauss
from infogami.utils.flash import add_flash_message
d726a9b
@cclauss
from infogami.utils.flash import add_flash_message
a60284e
@cclauss
from infogami.utils.flash import add_flash_message
97860a8
@cclauss
from infogami.utils.flash import add_flash_message
a850617
@cclauss
Merge branch 'master' into web.py-v0.40
b6f9e68
@tfmorris
Merge branch 'master' into web.py-v0.40
b47607d
@tfmorris
Revert "from infogami.utils.flash import add_flash_message"
04439ff 
This reverts commit a850617.
This reverts commit 97860a8.
This reverts commit a60284e.
This reverts commit d726a9b.
This reverts commit 6958bc2.
This reverts commit b9ce992.
This reverts commit c1db712.
@tfmorris
Fixup some imports for Python 3
0571084
@tfmorris
Fix some mistakes
3df8410
@cclauss
from web.browser import AppBrowser
d46bd94 
Cherry-picked from internetarchive#2416

Corresponds to the suggestion at internetarchive#2416 (comment)
@cclauss
from web.browser import AppBrowser
6497b0a
@cclauss
from openlibrary.catalog.marc import mnemonics
07f7dbb
@cclauss
from openlibrary.core import formats
9279fe6
@cclauss
from openlibrary.core import helpers
7d37ee3
@cclauss
from openlibrary.core.readableurls import ReadableUrlProcessor
c819b29
@cclauss
from openlibrary.core import cache, geo_ip, iprange
c880526
@cclauss
from openlibrary.core.processors.readableurls import ReadableUrlProce…
bb0b80f 
…ssor
@cclauss
from openlibrary.catalog.marc.marc_base import MarcBase, MarcExceptio…
98bd644 
…n, BadMARC
@cclauss
from six import StringIO
8e361c9
@cclauss cclauss mentioned this pull request Feb 1, 2020
Closed
@cclauss
Copy link
Collaborator

cclauss commented Mar 5, 2020

@tfmorris Would be willing to rebase this? It would be good to land the remaining changes.

@tfmorris
Copy link
Contributor Author

There are too many commits on this branch to attempt a rebase, but I merged the current master and, presuming I didn't screw up the merge, it looks like pretty much everything has been covered on the import front.

Since #2897 built on this work to start addressing test failures, I'll probably just switch to that and update it to reflect the current master. I'm not sure if I'll cherrypick the last dozen commits onto a new branch or just merge the master branch into it.

@cclauss Either way, I'll close this unless you see specific items to pull from the remaining diffs.

@cclauss
Copy link
Collaborator

cclauss commented Mar 11, 2020

I think we can close. Thanks.

@tfmorris tfmorris closed this Mar 11, 2020
@tfmorris tfmorris deleted the python3-imports branch April 18, 2020 23:18
@mekarpeles mekarpeles added python Pull requests that update Python code and removed Module: Python labels Sep 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cclauss cclauss cclauss approved these changes

Assignees

@hornc hornc

Labels
python Pull requests that update Python code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tfmorris @cclauss @hornc @mekarpeles