hmm... v0.3.0 added proper error handling, unneeded imports and version info, along with __main__

Author: AbstractUmbra

mystbin/__init__.py

@@ -22,5 +22,11 @@
 DEALINGS IN THE SOFTWARE.
 """
 
+from collections import namedtuple
+
 from .client import MystbinClient
 from .errors import *
+
+__version__ = "0.2.5"
+VersionInfo = namedtuple("VersionInfo", "major minor micro releaselevel serial")
+version_info = VersionInfo(major=0, minor=2, micro=5, releaselevel='final', serial=0)

mystbin/__main__.py

@@ -0,0 +1,82 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2020 AbstractUmbra
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+"""
+
+import argparse
+import platform
+import sys
+
+import aiohttp
+import pkg_resources
+try:
+    import requests
+except ImportError:
+    requests = None
+
+import mystbin
+
+
+def show_version():
+    entries = []
+
+    entries.append(
+        '- Python v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(sys.version_info))
+    version_info = mystbin.version_info
+    entries.append(
+        '- mystbin.py v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(version_info))
+    if version_info.releaselevel != 'final':
+        pkg = pkg_resources.get_distribution('mystbin.py')
+        if pkg:
+            entries.append(
+                '    - mystbin.py pkg_resources: v{0}'.format(pkg.version))
+
+    entries.append('- aiohttp v{0.__version__}'.format(aiohttp))
+    if requests is not None:
+        entries.append('  - [requests] v{0.__version__}'.format(requests))
+    uname = platform.uname()
+    entries.append(
+        '- system info: {0.system} {0.release} {0.version}'.format(uname))
+    print('\n'.join(entries))
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        prog='discord', description='Tools for helping with discord.py')
+    parser.add_argument('-v', '--version', action='store_true',
+                        help='shows the library version')
+    parser.set_defaults(func=core)
+
+    return parser, parser.parse_args()
+
+
+def core(parser, args):
+    if args.version:
+        show_version()
+
+
+def main():
+    parser, args = parse_args()
+    args.func(parser, args)
+
+
+main()

mystbin/client.py

@@ -26,12 +26,10 @@
 import json
 from typing import TYPE_CHECKING, Awaitable, Callable, Optional, Type, Union
 
+import aiohttp
 if TYPE_CHECKING:
     import requests
 
-import aiohttp
-import yarl
-
 from .constants import *
 from .errors import *
 from .objects import *
@@ -102,7 +100,7 @@ def _perform_sync_post(self, content: str, syntax: str = None) -> Paste:
         """ Sync post request. """
         payload = {'meta': [{'index': 0, 'syntax': syntax}]}
         response: Type["requests.Response"] = self.session.post(API_BASE_URL, files={
-                                                        'data': content, 'meta': (None, json.dumps(payload), 'application/json')}, timeout=CLIENT_TIMEOUT)
+            'data': content, 'meta': (None, json.dumps(payload), 'application/json')}, timeout=CLIENT_TIMEOUT)
         if response.status_code not in [200, 201]:
             raise APIError(response.status_code, response.text)
 
@@ -122,7 +120,7 @@ async def _perform_async_post(self, content: str, syntax: str = None) -> Paste:
         async with self.session.post(API_BASE_URL, data=multi_part_write) as response:
             status_code = response.status
             response_text = await response.text()
-            if status_code not in [200, 201]:
+            if status_code not in (200, ):
                 raise APIError(status_code, response_text)
             response_data = await response.json()
 
@@ -149,16 +147,20 @@ def get(self, paste_id: str) -> Union[PasteData, Awaitable]:
 
     def _perform_sync_get(self, paste_id: str, syntax: str = None) -> PasteData:
         """ Sync get request. """
-        response = self.session.get(
+        response: requests.Response = self.session.get(
             f"{API_BASE_URL}/{paste_id}", timeout=CLIENT_TIMEOUT)
+        if response.status_code not in (200, ):
+            raise BadPasteID("This is an invalid Mystb.in paste ID.")
         paste_data = response.json()
         return PasteData(paste_id, paste_data)
 
     async def _perform_async_get(self, paste_id: str, syntax: str = None) -> PasteData:
         """ Async get request. """
         if not self.session:
-            self.session = await self._generate_async_session()
+            self.session: aiohttp.ClientSession = await self._generate_async_session()
         async with self.session.get(f"{API_BASE_URL}/{paste_id}", timeout=aiohttp.ClientTimeout(CLIENT_TIMEOUT)) as response:
+            if response.status not in (200, ):
+                raise BadPasteID("This is an invalid Mystb.in paste ID.")
             paste_data = await response.json()
         return PasteData(paste_id, paste_data)