code/twython
1
0
Fork 0
Code Issues 23 Pull requests 4 Projects Releases 5 Packages Wiki Activity Actions

This Branch fixes issue with reconnection #490

Open
decklord wants to merge 1 commit from eoso/master into master
pull from: eoso/master
merge into: code:master
Conversation 2 Commits 1 Files changed 1 +18 -3
decklord commented 2018-05-04 14:43:18 -07:00 (Migrated from github.com)
Copy link

Please merge :)

Please merge :)
decklord commented 2018-05-04 14:50:24 -07:00 (Migrated from github.com)
Copy link

Didn't notice this was already on PR. Please close and ignore, but please merge https://github.com/ryanmcgrath/twython/pull/386

Didn't notice this was already on PR. Please close and ignore, but please merge https://github.com/ryanmcgrath/twython/pull/386
eoso commented 2018-05-05 20:09:05 -07:00 (Migrated from github.com)
Copy link

The PR #386 doesn't include the fix that rebuilds the session when it errors out. That was a workaround for errors which would occur on long running connections. If I remember correctly, it did fix the problem.

The PR #386 doesn't include the fix that rebuilds the session when it errors out. That was a workaround for errors which would occur on long running connections. If I remember correctly, it did fix the problem.
This pull request has changes conflicting with the target branch.
  • twython/api.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin eoso/master:eoso/master
git checkout eoso/master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff eoso/master
git checkout eoso/master
git rebase master
git checkout master
git merge --ff-only eoso/master
git checkout eoso/master
git rebase master
git checkout master
git merge --no-ff eoso/master
git checkout master
git merge --squash eoso/master
git checkout master
git merge --ff-only eoso/master
git checkout master
git merge eoso/master
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug

   
Enhancement

   
Feature Suggestion
No labels
Bug
Enhancement
Feature Suggestion
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: code/twython#490
No description provided.
Delete branch "eoso/master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?