diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index 84917038874ba1..b97eede55424ca 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -149,7 +149,7 @@ def _parsedate_tz(data):
# calls for a two-digit yy, but RFC 2822 (which obsoletes RFC 822)
# mandates a 4-digit yy. For more information, see the documentation for
# the time module.
- if yy < 100:
+ if len(str(yy)) > 2 and yy < 100:
# The year is between 1969 and 1999 (inclusive).
if yy > 68:
yy += 1900
diff --git a/Lib/test/test_parsedate_to_datetime.py b/Lib/test/test_parsedate_to_datetime.py
new file mode 100644
index 00000000000000..2656794b733ccf
--- /dev/null
+++ b/Lib/test/test_parsedate_to_datetime.py
@@ -0,0 +1,18 @@
+# Test to see if parsedate_to_datetime returns the correct year for different digit numbers, adhering to the RFC2822 spec
+
+import unittest
+from email.utils import parsedate_to_datetime
+
+class ParsedateToDatetimeTest(unittest.TestCase):
+ def test(self):
+ expectations = {
+ "Sat, 15 Aug 0001 23:12:09 +0500": "0001",
+ "Thu, 1 Sep 1 23:12:09 +0800": "0001",
+ "Thu, 7 Oct 123 23:12:09 +0500": "0123",
+ }
+ for input_string, output_string in expectations.items():
+ self.assertEqual(str(parsedate_to_datetime(input_string))[:4], output_string)
+
+if __name__ == '__main__':
+ unittest.main()
+
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 752e31359cf206..375f6aaedd8934 100644
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -39,7 +39,21 @@ def _update_variables(self, now):
if now[3] < 12: self.ampm='(AM|am)'
else: self.ampm='(PM|pm)'
- self.jan1 = time.localtime(time.mktime((now[0], 1, 1, 0, 0, 0, 0, 1, 0)))
+ jan1 = time.struct_time(
+ (
+ now.tm_year, # Year
+ 1, # Month (January)
+ 1, # Day (1st)
+ 0, # Hour (0)
+ 0, # Minute (0)
+ 0, # Second (0)
+ -1, # tm_wday (will be determined)
+ 1, # tm_yday (day 1 of the year)
+ -1, # tm_isdst (let the system determine)
+ )
+ )
+ # use mktime to get the correct tm_wday and tm_isdst values
+ self.jan1 = time.localtime(time.mktime(jan1))
try:
if now[8]: self.tz = time.tzname[1]
diff --git a/issues.py b/issues.py
new file mode 100644
index 00000000000000..4eb2dfd13e2011
--- /dev/null
+++ b/issues.py
@@ -0,0 +1,4 @@
+import datetime
+from email.utils import parsedate_to_datetime
+
+print(parsedate_to_datetime("Sat, 15 Aug 5000 23:12:09 +0500"))
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy