Factor out repeated session code.

Author: sheagcraig

CHANGELOG.md

@@ -6,9 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.1] 2020-04-28
+### Added
+- Reworked to simplify usage, and add alternate strategies.
+
 ## [0.1.0] 2020-04-25
 ### Added
 - Initial MacKeychainTransportAdapter source.
 
-[Unreleased]: https://github.com/sheagcraig/MacKeychainTransportAdapter/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/sheagcraig/MacKeychainTransportAdapter/compare/v0.2.1...HEAD
+[0.2.0]: https://github.com/sheagcraig/MacKeychainTransportAdapter/compare/v0.1.0...v0.2.1
 [0.1.0]: https://github.com/sheagcraig/MacKeychainTransportAdapter/releases/tag/v0.1.0

README.md

@@ -1,4 +1,4 @@
-# Hello!
+# MacSesh
 This package allows requests to verify certs with the macOS keychain,
 rather than using certifi. It also includes some tools for easily
 hooking up a `SecureTransport` adapter (a la Pip) and then later
@@ -50,17 +50,5 @@ Clean up after using the "basic" API:
 ```macsesh.extract_from_requests()```
 
 Any certs added to the keychains after starting a session will
-not be available. The sessions and adapters all have an update_truststore
-method for re-dumping the trust.
-```
->>> import macsesh
->>> sesh = macsesh.KeychainSession()
->>> response = sesh.get('https://cheeze.co')
-<A bunch of angry exception noise!>
-SSLVerificationError
->>> # I added the cheeze issuer's cert"
->>> sesh.update_truststore()
->>> response = sesh.get('https://cheeze.co')
->>> response.status_code
-200
-```
+not be available. Digging down in and updating the SSLContext is rough;
+just make a new session if you have this need!

macsesh/session.py

@@ -8,25 +8,28 @@
 from .simple_adapter import SimpleKeychainAdapter
 
 
-class KeychainSession(requests.Session):
-    """Requests session using the injected KeychainAdapter"""
+class BaseKeychainSession(requests.Session):
+
+    _adapter_class = KeychainAdapter
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.mount('https://', KeychainAdapter())
+        self.mount('https://', self._adapter_class())
+
+
+class KeychainSession(BaseKeychainSession):
+    """Requests session using the injected KeychainAdapter"""
 
+    _adapter_class = KeychainAdapter
 
-class SecureTransportSession(requests.Session):
+
+class SecureTransportSession(BaseKeychainSession):
     """Requests session using the SecureTransport"""
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.mount('https://', SecureTransportAdapter())
+    _adapter_class = SecureTransportAdapter
 
 
-class SimpleKeychainSession(requests.Session):
+class SimpleKeychainSession(BaseKeychainSession):
     """Requests session using the SimpleKeychainAdapter"""
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.mount('https://', SimpleKeychainAdapter())
+    _adapter_class = SimpleKeychainAdapter

macsesh/version.py

@@ -1 +1 @@
-__version__ = '0.2.0'
+__version__ = '0.2.1'