Fix release and version bump

Author: AbstractUmbra

mystbin/__init__.py

@@ -29,4 +29,4 @@
 
 __version__ = "1.0.1"
 VersionInfo = namedtuple("VersionInfo", "major minor micro releaselevel serial")
-version_info = VersionInfo(major=1, minor=0, micro=2, releaselevel="final", serial=0)
+version_info = VersionInfo(major=2, minor=1, micro=0, releaselevel="alpha", serial=0)

mystbin/client.py

@@ -56,42 +56,17 @@ class HTTPClient:
     def __init__(
         self,
         *,
-        api_key: str = None,
+        api_key: str = "",
         session: Optional[Union[aiohttp.ClientSession, requests.Session]] = None,
     ) -> None:
         self.api_key = api_key
         self._are_we_async = session is None or isinstance(
             session, aiohttp.ClientSession
         )
         self.session = (
-            self._generate_sync_session(session) if not self._are_we_async else None
+            self._generate_sync_session(session) if not self._are_we_async else session
         )
 
-    def _generate_sync_session(self, session: requests.Session) -> requests.Session:
-        """ We will update a :class:`requests.Session` instance with the auth we require. """
-        # the passed session was found to be 'sync'.
-        if self.api_key:
-            session.headers.update(
-                {"Authorization": self.api_key, "User-Agent": "Mystbin.py"}
-            )
-
-        return session
-
-    async def _generate_async_session(
-        self, session: Optional[aiohttp.ClientSession] = None
-    ) -> aiohttp.ClientSession:
-        """ We will update (or create) a :class:`aiohttp.ClientSession` instance with the auth we require. """
-        if not session:
-            session = aiohttp.ClientSession(raise_for_status=False)
-
-        if self.api_key:
-            session._default_headers.update(
-                {"Authorization": self.api_key, "User-Agent": "Mystbin.py"}
-            )
-
-        session._timeout = aiohttp.ClientTimeout(CLIENT_TIMEOUT)
-        return session
-
     def post(self, content: str, syntax: str = None) -> Union[Paste, Awaitable]:
         """
         This will post to the Mystb.in API and return the url.
@@ -118,6 +93,7 @@ def _perform_sync_post(self, content: str, syntax: str = None) -> Paste:
                 "meta": (None, json.dumps(payload), "application/json"),
             },
             timeout=CLIENT_TIMEOUT,
+            headers={"Authorization": self.api_key}
         )
 
         if response.status_code not in [200, 201]:
@@ -138,7 +114,12 @@ async def _perform_async_post(self, content: str, syntax: str = None) -> Paste:
         )
         paste_content.set_content_disposition("form-data", name="meta")
 
-        async with self.session.post(API_BASE_URL, data=multi_part_write) as response:
+        async with self.session.post(
+            API_BASE_URL,
+            data=multi_part_write,
+            timeout=aiohttp.ClientTimeout(CLIENT_TIMEOUT),
+            headers={"Authorization": self.api_key},
+        ) as response:
             status_code = response.status
             response_text = await response.text()
             if status_code not in (200,):
@@ -163,14 +144,13 @@ def get(self, paste_id: str) -> Union[PasteData, Awaitable]:
             raise BadPasteID("This is an invalid Mystb.in paste ID.")
 
         paste_id = paste_id_match.group("ID")
-        syntax = paste_id_match.group("syntax")
 
         if not self._are_we_async:
-            return self._perform_sync_get(paste_id, syntax)
+            return self._perform_sync_get(paste_id)
 
-        return self._perform_async_get(paste_id, syntax)
+        return self._perform_async_get(paste_id)
 
-    def _perform_sync_get(self, paste_id: str, syntax: str = None) -> PasteData:
+    def _perform_sync_get(self, paste_id: str) -> PasteData:
         """ Sync get request. """
         response: requests.Response = self.session.get(
             f"{API_BASE_URL}/{paste_id}", timeout=CLIENT_TIMEOUT
@@ -182,7 +162,7 @@ def _perform_sync_get(self, paste_id: str, syntax: str = None) -> PasteData:
         paste_data = response.json()
         return PasteData(paste_id, paste_data)
 
-    async def _perform_async_get(self, paste_id: str, syntax: str = None) -> PasteData:
+    async def _perform_async_get(self, paste_id: str) -> PasteData:
         """ Async get request. """
         if not self.session:
             self.session: aiohttp.ClientSession = await self._generate_async_session()