Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
* pass Gregorian to tzinfo.dst #188
* typing: use int for fold #186

### Added

* Add `date.strptime()` and make `strptime()` preserve subclasses, matching the standard library behavior


## [6.0.2] 2026-08-06

Expand Down
14 changes: 10 additions & 4 deletions jdatetime/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,12 @@ def repl(match):
def aslocale(self, locale: str) -> date:
return date(self.year, self.month, self.day, locale=locale)

@classmethod
def strptime(cls, date_string: str, format: str) -> date:
"""Return a date corresponding to date_string, parsed according to format."""
dt = datetime.strptime(date_string, format)
return cls(dt.year, dt.month, dt.day, locale=dt.locale)


date.min = date(MINYEAR, 1, 1)
date.max = date(MAXYEAR, 12, 30)
Expand Down Expand Up @@ -897,8 +903,8 @@ def tzinfo(self) -> py_datetime.tzinfo | None:
def fold(self) -> int:
return self._fold

@staticmethod
def strptime(date_string: str, format: str) -> datetime:
@classmethod
def strptime(cls, date_string: str, format: str) -> datetime:
"""string, format -> new datetime parsed from a string (like time.strptime())"""
regex = _directives_to_pattern(re.escape(format))

Expand Down Expand Up @@ -927,9 +933,9 @@ def strptime(date_string: str, format: str) -> datetime:
raise ValueError(f"time data '{date_string}' does not match format '{format}'")

timezone_string = get('z', None)
timezone = datetime._timezone_from_string(timezone_string)
timezone = cls._timezone_from_string(timezone_string)

return datetime(
return cls(
year,
month,
int(get('d', 1)),
Expand Down
27 changes: 27 additions & 0 deletions tests/test_jdate.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,30 @@ def test_fromisoformat():

def test_resolution():
assert jdatetime.date.resolution == jdatetime.timedelta(days=1)


@pytest.mark.parametrize(
('date_string', 'format'),
[
('1405-05-19', '%Y-%m-%d'),
('1405-05-19 13', '%Y-%m-%d %H'),
('1405-05-19 13:45', '%Y-%m-%d %H:%M'),
('1405-05-19 13:45:59', '%Y-%m-%d %H:%M:%S'),
('1405-05-19 13:45:59.123456', '%Y-%m-%d %H:%M:%S.%f'),
('1405-05-19 13:45:59 +0330', '%Y-%m-%d %H:%M:%S %z'),
],
)
def test_strptime_discards_time(date_string, format):
result = jdatetime.date.strptime(date_string, format)

assert result == jdatetime.date(1405, 5, 19)


def test_strptime_returns_subclass():
class MyDate(jdatetime.date):
pass

result = MyDate.strptime('1405-05-19', '%Y-%m-%d')

assert type(result) is MyDate
assert result == MyDate(1405, 5, 19)
10 changes: 10 additions & 0 deletions tests/test_jdatetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -780,3 +780,13 @@ def test_pickle():
def test_unpickle_older_datetime_object():
dt = load_pickle('jdatetime_py3_jdatetime3.7.pickle')
assert dt == jdatetime.datetime(1400, 10, 11, 1, 2, 3, 30)


def test_strptime_returns_subclass():
class MyDateTime(jdatetime.datetime):
pass

result = MyDateTime.strptime('1405-05-19 12:34:56', '%Y-%m-%d %H:%M:%S')

assert type(result) is MyDateTime
assert result == MyDateTime(1405, 5, 19, 12, 34, 56)
Loading