Merge pull request #36 from thewebscraping/bugs/cannot-unpickle-cookiejar-#35

[Bug]: Cannot unpickle CookieJar #35

Author: thewebscraping

tls_requests/__version__.py

@@ -3,5 +3,5 @@
 __url__ = "https://github.com/thewebscraping/tls-requests"
 __author__ = "Tu Pham"
 __author_email__ = "[email protected]"
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 __license__ = "MIT"

tls_requests/models/cookies.py

@@ -350,6 +350,7 @@ def __setstate__(self, state):
         """Unlike a normal CookieJar, this class is pickleable."""
         self.__dict__.update(state)
         if "_cookies_lock" not in self.__dict__:
+            import threading
             self._cookies_lock = threading.RLock()
 
     def copy(self):

tls_requests/models/response.py

@@ -53,7 +53,6 @@ def __init__(
         self._is_closed = False
         self._next: Optional[Request] = None
         self.headers = Headers(headers)
-        self.stream = None
         self.status_code = status_code
         self.history = history if isinstance(history, list) else []
         self.default_encoding = default_encoding
@@ -135,6 +134,7 @@ def charset(self) -> Optional[str]:
             msg = Message()
             msg["content-type"] = self.headers["Content-Type"]
             return msg.get_content_charset(failobj=None)
+        return None
 
     @property
     def encoding(self) -> str:
@@ -228,6 +228,10 @@ def close(self) -> None:
             self._is_stream_consumed = True
             self.stream.close()
 
+        # Fix pickle dump
+        # Ref: https://github.com/thewebscraping/tls-requests/issues/35
+        self.stream = None
+
     async def aclose(self) -> None:
         return self.close()