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.

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

Refactors for beta #1212

Merged
merged 3 commits into from
Jan 26, 2024
Merged

Refactors for beta #1212

merged 3 commits into from
Jan 26, 2024

Conversation

richardm-stripe
Copy link
Contributor

@richardm-stripe richardm-stripe commented Jan 26, 2024

When merging master into beta today (#1211) @anniel-stripe and I encountered some merge conflicts because beta branch had some refactoring that master branch did not.

  • Inside a test there is a TestHandler helper class. Python doesn't like that this begins with Test so in the beta branch this was renamed to MyTestHandler.
  • There is a lot of code duplication between APIRequestor.request_raw and APIRequestor.request_raw_async. In the beta branch, a lot of the common logic was factored out. We undid this when resolving the merge conflict, but here is the same factoring out. You can see the full effect in the beta branch.

@richardm-stripe richardm-stripe marked this pull request as ready for review January 26, 2024 00:56
@richardm-stripe richardm-stripe requested review from a team and anniel-stripe and removed request for a team January 26, 2024 16:52
Copy link
Contributor

@anniel-stripe anniel-stripe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@richardm-stripe richardm-stripe merged commit 28d35d8 into master Jan 26, 2024
15 checks passed
@xavdid-stripe xavdid-stripe deleted the richardm-refactors-for-beta branch May 10, 2024 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants