BUG: monthly periods prior to dec 1969 off by one year #1570

pandas-dev · Jul 6, 2012 · 42be719 · 42be719
1 parent 0bdd555
commit 42be719
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pandas/src/period.c b/pandas/src/period.c
@@ -206,6 +206,7 @@ int dInfoCalc_SetFromAbsDate(register struct date_info *dinfo,
     } else {
         Py_Error(PyExc_ValueError, "unknown calendar");
     }
+
     if (absdate > 0) year++;
 
     /* Apply corrections to reach the correct year */
@@ -548,9 +549,8 @@ static npy_int64 asfreq_WtoS(npy_int64 ordinal, char relation, asfreq_info *af_i
     { return asfreq_DtoS(asfreq_WtoD(ordinal, relation, af_info), relation, &NULL_AF_INFO); }
 
 //************ FROM MONTHLY ***************
-
 static void MtoD_ym(npy_int64 ordinal, int *y, int *m) {
-    *y = ordinal / 12 + BASE_YEAR;
+    *y = floordiv(ordinal, 12) + BASE_YEAR;
     *m = mod_compat(ordinal, 12) + 1;
 }
 

diff --git a/pandas/tseries/tests/test_period.py b/pandas/tseries/tests/test_period.py
@@ -41,6 +41,10 @@ def test_quarterly_negative_ordinals(self):
         self.assertEquals(p.year, 1969)
         self.assertEquals(p.quarter, 3)
 
+        p = Period(ordinal=-2, freq='M')
+        self.assertEquals(p.year, 1969)
+        self.assertEquals(p.month, 11)
+
     def test_period_cons_quarterly(self):
         # bugs in scikits.timeseries
         for month in MONTHS: