python-telegram-bot · Bibo-Joshi · Oct 5, 2021 · Jul 14, 2021 · Aug 11, 2021 · Aug 11, 2021
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -43,6 +43,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - `DonalDuck004 <https://github.com/DonalDuck004>`_
 - `Eana Hufwe <https://github.com/blueset>`_
 - `Ehsan Online <https://github.com/ehsanonline>`_
+- `Eldad Carin <https://github.com/eldbud>`_
 - `Eli Gao <https://github.com/eligao>`_
 - `Emilio Molinari <https://github.com/xates>`_
 - `ErgoZ Riftbit Vaper <https://github.com/ergoz>`_

diff --git a/examples/arbitrarycallbackdatabot.py b/examples/arbitrarycallbackdatabot.py
@@ -84,7 +84,7 @@ def handle_invalid_button(update: Update, context: CallbackContext) -> None:
 def main() -> None:
     """Run the bot."""
     # We use persistence to demonstrate how buttons can still work after the bot was restarted
-    persistence = PicklePersistence(filename='arbitrarycallbackdatabot.pickle')
+    persistence = PicklePersistence(filepath='arbitrarycallbackdatabot')
     # Create the Updater and pass it your bot's token.
     updater = Updater("TOKEN", persistence=persistence, arbitrary_callback_data=True)
 

diff --git a/examples/passportbot.py b/examples/passportbot.py
@@ -11,6 +11,7 @@
 
 """
 import logging
+from pathlib import Path
 
 from telegram import Update
 from telegram.ext import Updater, MessageHandler, Filters, CallbackContext
@@ -101,8 +102,7 @@ def msg(update: Update, context: CallbackContext) -> None:
 def main() -> None:
     """Start the bot."""
     # Create the Updater and pass it your token and private key
-    with open('private.key', 'rb') as private_key:
-        updater = Updater("TOKEN", private_key=private_key.read())
+    updater = Updater("TOKEN", private_key=Path('private.key').read_bytes())
 
     # Get the dispatcher to register handlers
     dispatcher = updater.dispatcher

diff --git a/examples/persistentconversationbot.py b/examples/persistentconversationbot.py
@@ -132,7 +132,7 @@ def done(update: Update, context: CallbackContext) -> int:
 def main() -> None:
     """Run the bot."""
     # Create the Updater and pass it your bot's token.
-    persistence = PicklePersistence(filename='conversationbot')
+    persistence = PicklePersistence(filepath='conversationbot')
     updater = Updater("TOKEN", persistence=persistence)
 
     # Get the dispatcher to register handlers

diff --git a/setup.py b/setup.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 """The setup and build script for the python-telegram-bot library."""
-import os
 import subprocess
 import sys
+from pathlib import Path
 
 from setuptools import setup, find_packages
 
@@ -13,7 +13,7 @@ def get_requirements(raw=False):
     """Build the requirements list for this project"""
     requirements_list = []
 
-    with open('requirements.txt') as reqs:
+    with Path('requirements.txt').open() as reqs:
         for install in reqs:
             if install.startswith('# only telegram.ext:'):
                 if raw:
@@ -47,63 +47,60 @@ def get_setup_kwargs(raw=False):
     packages, requirements = get_packages_requirements(raw=raw)
 
     raw_ext = "-raw" if raw else ""
-    readme = f'README{"_RAW" if raw else ""}.rst'
+    readme = Path(f'README{"_RAW" if raw else ""}.rst')
 
-    fn = os.path.join('telegram', 'version.py')
-    with open(fn) as fh:
+    with Path('telegram/version.py').open() as fh:
         for line in fh.readlines():
             if line.startswith('__version__'):
                 exec(line)
 
-    with open(readme, 'r', encoding='utf-8') as fd:
-
-        kwargs = dict(
-            script_name=f'setup{raw_ext}.py',
-            name=f'python-telegram-bot{raw_ext}',
-            version=locals()['__version__'],
-            author='Leandro Toledo',
-            author_email='devs@python-telegram-bot.org',
-            license='LGPLv3',
-            url='https://python-telegram-bot.org/',
-            # Keywords supported by PyPI can be found at https://git.io/JtLIZ
-            project_urls={
-                "Documentation": "https://python-telegram-bot.readthedocs.io",
-                "Bug Tracker": "https://github.com/python-telegram-bot/python-telegram-bot/issues",
-                "Source Code": "https://github.com/python-telegram-bot/python-telegram-bot",
-                "News": "https://t.me/pythontelegrambotchannel",
-                "Changelog": "https://python-telegram-bot.readthedocs.io/en/stable/changelog.html",
-            },
-            download_url=f'https://pypi.org/project/python-telegram-bot{raw_ext}/',
-            keywords='python telegram bot api wrapper',
-            description="We have made you a wrapper you can't refuse",
-            long_description=fd.read(),
-            long_description_content_type='text/x-rst',
-            packages=packages,
-
-            install_requires=requirements,
-            extras_require={
-                'json': 'ujson',
-                'socks': 'PySocks',
-                # 3.4-3.4.3 contained some cyclical import bugs
-                'passport': 'cryptography!=3.4,!=3.4.1,!=3.4.2,!=3.4.3',
-            },
-            include_package_data=True,
-            classifiers=[
-                'Development Status :: 5 - Production/Stable',
-                'Intended Audience :: Developers',
-                'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
-                'Operating System :: OS Independent',
-                'Topic :: Software Development :: Libraries :: Python Modules',
-                'Topic :: Communications :: Chat',
-                'Topic :: Internet',
-                'Programming Language :: Python',
-                'Programming Language :: Python :: 3',
-                'Programming Language :: Python :: 3.7',
-                'Programming Language :: Python :: 3.8',
-                'Programming Language :: Python :: 3.9',
-            ],
-            python_requires='>=3.7'
-        )
+    kwargs = dict(
+        script_name=f'setup{raw_ext}.py',
+        name=f'python-telegram-bot{raw_ext}',
+        version=locals()['__version__'],
+        author='Leandro Toledo',
+        author_email='devs@python-telegram-bot.org',
+        license='LGPLv3',
+        url='https://python-telegram-bot.org/',
+        # Keywords supported by PyPI can be found at https://git.io/JtLIZ
+        project_urls={
+            "Documentation": "https://python-telegram-bot.readthedocs.io",
+            "Bug Tracker": "https://github.com/python-telegram-bot/python-telegram-bot/issues",
+            "Source Code": "https://github.com/python-telegram-bot/python-telegram-bot",
+            "News": "https://t.me/pythontelegrambotchannel",
+            "Changelog": "https://python-telegram-bot.readthedocs.io/en/stable/changelog.html",
+        },
+        download_url=f'https://pypi.org/project/python-telegram-bot{raw_ext}/',
+        keywords='python telegram bot api wrapper',
+        description="We have made you a wrapper you can't refuse",
+        long_description=readme.read_text(),
+        long_description_content_type='text/x-rst',
+        packages=packages,
+
+        install_requires=requirements,
+        extras_require={
+            'json': 'ujson',
+            'socks': 'PySocks',
+            # 3.4-3.4.3 contained some cyclical import bugs
+            'passport': 'cryptography!=3.4,!=3.4.1,!=3.4.2,!=3.4.3',
+        },
+        include_package_data=True,
+        classifiers=[
+            'Development Status :: 5 - Production/Stable',
+            'Intended Audience :: Developers',
+            'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
+            'Operating System :: OS Independent',
+            'Topic :: Software Development :: Libraries :: Python Modules',
+            'Topic :: Communications :: Chat',
+            'Topic :: Internet',
+            'Programming Language :: Python',
+            'Programming Language :: Python :: 3',
+            'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8',
+            'Programming Language :: Python :: 3.9',
+        ],
+        python_requires='>=3.7'
+    )
 
     return kwargs