Skip to content

Commit b57b967

Browse files
committed
fix
1 parent c14c6d2 commit b57b967

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

usps/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.9.1"
1+
__version__ = "0.9.2"

usps/tracking/ups.py

+8-12
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
# Modules
44
from datetime import datetime, timedelta
55

6-
from requests import Session
7-
86
from usps.timezones import LOCAL_TIMEZONE
9-
from usps.tracking import Package, Step, StatusNotAvailable
7+
from usps.tracking import SESSION, Package, Step, StatusNotAvailable
108

119
# Handle mapping
1210
UPS_MILESTONE_MAPPINGS = {
@@ -19,7 +17,6 @@
1917

2018
# Main class
2119
class UPSTracking:
22-
_session: Session | None = None
2320
_failcount: int = 0
2421

2522
@staticmethod
@@ -28,18 +25,15 @@ def __map_milestone_name(milestone: str) -> str:
2825

2926
@classmethod
3027
def track_package(cls, tracking_number: str) -> Package:
31-
if cls._session is None:
32-
cls._session = Session()
33-
3428
try:
35-
if not cls._session.cookies:
36-
cls._session.get("https://www.ups.com/track", timeout = 1)
29+
if "X-XSRF-TOKEN-ST" not in SESSION.cookies:
30+
SESSION.get("https://www.ups.com/track", timeout = 1)
3731

38-
response = cls._session.post(
32+
response = SESSION.post(
3933
"https://webapis.ups.com/track/api/Track/GetStatus?loc=en_US",
4034
json = {"Locale": "en_US", "TrackingNumber": [tracking_number]},
4135
headers = {
42-
"X-XSRF-TOKEN": cls._session.cookies["X-XSRF-TOKEN-ST"]
36+
"X-XSRF-TOKEN": SESSION.cookies["X-XSRF-TOKEN-ST"]
4337
},
4438
timeout = 1
4539
).json()
@@ -49,7 +43,9 @@ def track_package(cls, tracking_number: str) -> Package:
4943
raise StatusNotAvailable("API request failed")
5044

5145
cls._failcount += 1
52-
cls._session = Session()
46+
if "X-XSRF-TOKEN-ST":
47+
SESSION.cookies.pop("X-XSRF-TOKEN-ST")
48+
5349
return cls.track_package(tracking_number)
5450

5551
if response["statusCode"] != "200":

0 commit comments

Comments
 (0)