Merge branch 'custombd' of https://github.com/sinhrks/pandas into sinhrks-custombd

Conflicts:
	doc/source/v0.14.1.txt

Author: jreback

doc/source/v0.14.1.txt

@@ -88,3 +88,4 @@ Bug Fixes
 - Bug in inferred_freq results in None for eastern hemisphere timezones (:issue:`7310`)
 - Bug in ``Easter`` returns incorrect date when offset is negative (:issue:`7195`)
 - Bug in broadcasting with ``.div``, integer dtypes and divide-by-zero (:issue:`7325`)
+- Bug in ``CustomBusinessDay.apply`` raiases ``NameError`` when ``np.datetime64`` object is passed (:issue:`7196`)

pandas/tseries/offsets.py

@@ -528,7 +528,6 @@ def apply(self, other):
 
         # Distinguish input cases to enhance performance
         if isinstance(other, datetime):
-            dtype = type(other)
             date_in = other
             np_dt = np.datetime64(date_in.date())
 
@@ -547,7 +546,6 @@ def apply(self, other):
             return as_timestamp(result)
 
         elif isinstance(other, np.datetime64):
-            dtype = other.dtype
             date_in = other
             np_day = date_in.astype('datetime64[D]')
             np_time = date_in - np_day
@@ -556,7 +554,7 @@ def apply(self, other):
                                   busdaycal=self.busdaycalendar)
 
             if not self.normalize:
-                result = np_day_incr + np_time
+                result = np_incr_dt + np_time
             else:
                 result = np_incr_dt
 

pandas/tseries/tests/test_offsets.py

@@ -382,6 +382,7 @@ class TestCustomBusinessDay(Base):
 
     def setUp(self):
         self.d = datetime(2008, 1, 1)
+        self.nd = np.datetime64('2008-01-01 00:00:00Z')
 
         _skip_if_no_cday()
         self.offset = CDay()
@@ -417,6 +418,7 @@ def test_hash(self):
 
     def testCall(self):
         self.assertEqual(self.offset2(self.d), datetime(2008, 1, 3))
+        self.assertEqual(self.offset2(self.nd), datetime(2008, 1, 3))
 
     def testRAdd(self):
         self.assertEqual(self.d + self.offset2, self.offset2 + self.d)