Skip to content

Rename Parameter proxy_url to proxy and Support httpx.Proxy as Input#3939

Merged
Bibo-Joshi merged 6 commits into
masterfrom
more-proxies
Oct 23, 2023
Merged

Rename Parameter proxy_url to proxy and Support httpx.Proxy as Input#3939
Bibo-Joshi merged 6 commits into
masterfrom
more-proxies

Conversation

@Bibo-Joshi

Copy link
Copy Markdown
Member

Closes #3844

@tsnoam tsnoam left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lgtm. see comments if you care to change anything.

Comment thread telegram/request/_httpxrequest.py Outdated
Comment on lines +96 to +97
* For Socks5 support, additional dependencies are required. Make sure to install
PTB via :command:`pip install "python-telegram-bot[socks]"` in this case.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
* For Socks5 support, additional dependencies are required. Make sure to install
PTB via :command:`pip install "python-telegram-bot[socks]"` in this case.
* For Socks5 support, additional dependencies are required. They can be installed using the
command :command:`pip install "python-telegram-bot[socks]"`.

@harshil21 harshil21 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The ApplicationBuilder.proxy_url part should be changed as well? Shouldn't the tests fail because of the uncaught warning raised?

Comment thread telegram/request/_httpxrequest.py
Comment thread telegram/request/_httpxrequest.py Outdated
@Bibo-Joshi

Copy link
Copy Markdown
Member Author

The ApplicationBuilder.proxy_url part should be changed as well? Shouldn't the tests fail because of the uncaught warning raised?

Sorry, hadn't seen this. Will change appbilder. PTB warnings are explicitly ignored in conftest.py so that we don't have to catch them on every test

Comment thread telegram/ext/_applicationbuilder.py Outdated

@harshil21 harshil21 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tests look good, just some typos:

Comment thread telegram/ext/_applicationbuilder.py Outdated
Comment thread telegram/ext/_applicationbuilder.py Outdated

@harshil21 harshil21 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lgtm

@Bibo-Joshi Bibo-Joshi merged commit 075f517 into master Oct 23, 2023
@Bibo-Joshi Bibo-Joshi deleted the more-proxies branch October 23, 2023 19:09
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 31, 2023
@Bibo-Joshi Bibo-Joshi added 🔌 enhancement pr description: enhancement and removed enhancement labels Nov 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

🔌 enhancement pr description: enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[FEATURE] SSL verification + custom proxies

4 participants