Merge ebd4207 into 3c18ced

Unidata · Sep 26, 2020 · b34c332 · b34c332
2 parents 3c18ced + ebd4207
commit b34c332
Show file tree

Hide file tree

Showing 6 changed files with 803 additions and 404 deletions.
diff --git a/Changelog b/Changelog
@@ -1,6 +1,11 @@
-since version 1.2.1
-===================
+version 1.3.0 (not yet released)
+================================
  * zero pad years in strtime (issue #194)
+ * have cftime.datetime constuctor create 'calendar-aware' instances if the calendar kwarg is provided.
+   The default calendar is now None (the instance is not calendar-aware unless a valid
+   calendar string is provided).  The previous default was 'standard', but the instances were
+   not calendar-aware unless created directly by the various calendar-specific sub-class
+   constructors (issue #198).  
 
 version 1.2.1 (release tag v1.2.1rel)
 =====================================

diff --git a/cftime/__init__.py b/cftime/__init__.py
@@ -2,8 +2,8 @@
 from ._cftime import _parse_date, date2index, time2index
 from ._cftime import datetime, real_datetime
 from ._cftime import DatetimeNoLeap, DatetimeAllLeap, Datetime360Day, DatetimeJulian, \
-                         DatetimeGregorian, DatetimeProlepticGregorian
+                     DatetimeGregorian, DatetimeProlepticGregorian, DATE_TYPES
 from ._cftime import microsec_units, millisec_units, \
-                         sec_units, hr_units, day_units, min_units
+                     sec_units, hr_units, day_units, min_units
 from ._cftime import num2date, date2num, date2index, num2pydate
 from ._cftime import __version__