Skip to content

Commit

Permalink
bpo-31222: Make (datetime|date|time).replace return subclass type in …
Browse files Browse the repository at this point in the history
…Pure Python (python#4176)
  • Loading branch information
pganssle authored and vstinner committed Nov 9, 2017
1 parent 72fa301 commit 191e993
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Lib/datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ def replace(self, year=None, month=None, day=None):
month = self._month
if day is None:
day = self._day
return date(year, month, day)
return type(self)(year, month, day)

# Comparisons of date objects with other.

Expand Down Expand Up @@ -1316,7 +1316,7 @@ def replace(self, hour=None, minute=None, second=None, microsecond=None,
tzinfo = self.tzinfo
if fold is None:
fold = self._fold
return time(hour, minute, second, microsecond, tzinfo, fold=fold)
return type(self)(hour, minute, second, microsecond, tzinfo, fold=fold)

# Pickle support.

Expand Down Expand Up @@ -1597,7 +1597,7 @@ def replace(self, year=None, month=None, day=None, hour=None,
tzinfo = self.tzinfo
if fold is None:
fold = self.fold
return datetime(year, month, day, hour, minute, second,
return type(self)(year, month, day, hour, minute, second,
microsecond, tzinfo, fold=fold)

def _local_timezone(self):
Expand Down
14 changes: 14 additions & 0 deletions Lib/test/datetimetester.py
Original file line number Diff line number Diff line change
Expand Up @@ -1520,6 +1520,13 @@ def test_replace(self):
base = cls(2000, 2, 29)
self.assertRaises(ValueError, base.replace, year=2001)

def test_subclass_replace(self):
class DateSubclass(self.theclass):
pass

dt = DateSubclass(2012, 1, 1)
self.assertIs(type(dt.replace(year=2013)), DateSubclass)

def test_subclass_date(self):

class C(self.theclass):
Expand Down Expand Up @@ -2626,6 +2633,13 @@ def test_replace(self):
self.assertRaises(ValueError, base.replace, second=100)
self.assertRaises(ValueError, base.replace, microsecond=1000000)

def test_subclass_replace(self):
class TimeSubclass(self.theclass):
pass

ctime = TimeSubclass(12, 30)
self.assertIs(type(ctime.replace(hour=10)), TimeSubclass)

def test_subclass_time(self):

class C(self.theclass):
Expand Down

0 comments on commit 191e993

Please sign in to comment.