@@ -5830,6 +5830,71 @@ def test_apply_dont_convert_dtype(self):
58305830 self .assertEqual (result .dtype , object )
58315831
58325832 def test_convert_objects (self ):
5833+ # Tests: All to nans, coerce, true
5834+ # Test coercion returns correct type
5835+ s = Series (['a' , 'b' , 'c' ])
5836+ results = s .convert_objects ('coerce' , False , False )
5837+ expected = Series ([lib .NaT ] * 3 )
5838+ assert_series_equal (results , expected )
5839+
5840+ results = s .convert_objects (False , 'coerce' , False )
5841+ expected = Series ([np .nan ] * 3 )
5842+ assert_series_equal (results , expected )
5843+
5844+ expected = Series ([lib .NaT ] * 3 , dtype = np .dtype ('m8[ns]' ))
5845+ results = s .convert_objects (False , False , 'coerce' )
5846+ assert_series_equal (results , expected )
5847+
5848+ dt = datetime (2001 , 1 , 1 , 0 , 0 )
5849+ td = dt - datetime (2000 , 1 , 1 , 0 , 0 )
5850+ # Test coercion with mixed types
5851+ s = Series (['a' , '3.1415' , dt , td ])
5852+ results = s .convert_objects ('coerce' ,False ,False )
5853+ expected = Series ([lib .NaT , lib .NaT , dt , lib .NaT ])
5854+ assert_series_equal (results , expected )
5855+
5856+ results = s .convert_objects (False , 'coerce' ,False )
5857+ expected = Series ([nan , 3.1415 , nan , nan ])
5858+ assert_series_equal (results , expected )
5859+
5860+ results = s .convert_objects (False , False , 'coerce' )
5861+ expected = Series ([lib .NaT , lib .NaT , lib .NaT , td ],
5862+ dtype = np .dtype ('m8[ns]' ))
5863+ assert_series_equal (results , expected )
5864+
5865+ # Test standard conversion returns original
5866+ results = s .convert_objects (True , False , False )
5867+ assert_series_equal (results , s )
5868+ results = s .convert_objects (False , True , False )
5869+ expected = Series ([nan , 3.1415 , nan , nan ])
5870+ assert_series_equal (results , expected )
5871+ results = s .convert_objects (False , False , True )
5872+ assert_series_equal (results , s )
5873+
5874+ # test pass-through and non-conversion when other types selected
5875+ s = Series (['1.0' ,'2.0' ,'3.0' ])
5876+ results = s .convert_objects (True ,True ,True )
5877+ expected = Series ([1.0 ,2.0 ,3.0 ])
5878+ assert_series_equal (results , expected )
5879+ results = s .convert_objects (True ,False ,True )
5880+ assert_series_equal (results , s )
5881+
5882+ s = Series ([datetime (2001 , 1 , 1 , 0 , 0 ),datetime (2001 , 1 , 1 , 0 , 0 )],
5883+ dtype = 'O' )
5884+ results = s .convert_objects (True ,True ,True )
5885+ expected = Series ([datetime (2001 , 1 , 1 , 0 , 0 ),datetime (2001 , 1 , 1 , 0 , 0 )])
5886+ assert_series_equal (results , expected )
5887+ results = s .convert_objects (False ,True ,True )
5888+ assert_series_equal (results , s )
5889+
5890+ td = datetime (2001 , 1 , 1 , 0 , 0 ) - datetime (2000 , 1 , 1 , 0 , 0 )
5891+ s = Series ([td , td ], dtype = 'O' )
5892+ results = s .convert_objects (True ,True ,True )
5893+ expected = Series ([td , td ])
5894+ assert_series_equal (results , expected )
5895+ results = s .convert_objects (True ,True ,False )
5896+ assert_series_equal (results , s )
5897+
58335898
58345899 s = Series ([1. , 2 , 3 ], index = ['a' , 'b' , 'c' ])
58355900 result = s .convert_objects (convert_dates = False , convert_numeric = True )
@@ -5848,20 +5913,19 @@ def test_convert_objects(self):
58485913
58495914 r = s .copy ().astype ('O' )
58505915 r ['a' ] = 'garbled'
5851- expected = s .copy ()
5852- expected ['a' ] = np .nan
58535916 result = r .convert_objects (convert_dates = False , convert_numeric = True )
5917+ expected = s .copy ()
5918+ expected ['a' ] = nan
58545919 assert_series_equal (result , expected )
58555920
58565921 # GH 4119, not converting a mixed type (e.g.floats and object)
58575922 s = Series ([1 , 'na' , 3 , 4 ])
58585923 result = s .convert_objects (convert_numeric = True )
5859- expected = Series ([1 , np . nan , 3 , 4 ])
5924+ expected = Series ([1 , nan , 3 , 4 ])
58605925 assert_series_equal (result , expected )
58615926
58625927 s = Series ([1 , '' , 3 , 4 ])
58635928 result = s .convert_objects (convert_numeric = True )
5864- expected = Series ([1 , np .nan , 3 , 4 ])
58655929 assert_series_equal (result , expected )
58665930
58675931 # dates
@@ -5885,23 +5949,28 @@ def test_convert_objects(self):
58855949 [Timestamp (
58865950 '20010101' ), Timestamp ('20010102' ), Timestamp ('20010103' ),
58875951 lib .NaT , lib .NaT , lib .NaT , Timestamp ('20010104' ), Timestamp ('20010105' )], dtype = 'M8[ns]' )
5888- result = s2 .convert_objects (
5889- convert_dates = 'coerce' , convert_numeric = False )
5952+ result = s2 .convert_objects (convert_dates = 'coerce' ,
5953+ convert_numeric = False ,
5954+ convert_timedeltas = False )
58905955 assert_series_equal (result , expected )
5891- result = s2 .convert_objects (
5892- convert_dates = 'coerce' , convert_numeric = True )
5956+ result = s2 .convert_objects (convert_dates = 'coerce' ,
5957+ convert_numeric = False ,
5958+ convert_timedeltas = False )
58935959 assert_series_equal (result , expected )
58945960
58955961 # preserver all-nans (if convert_dates='coerce')
58965962 s = Series (['foo' , 'bar' , 1 , 1.0 ], dtype = 'O' )
5897- result = s .convert_objects (
5898- convert_dates = 'coerce' , convert_numeric = False )
5899- assert_series_equal (result , s )
5963+ result = s .convert_objects (convert_dates = 'coerce' ,
5964+ convert_numeric = False ,
5965+ convert_timedeltas = False )
5966+ expected = Series ([lib .NaT ]* 4 )
5967+ assert_series_equal (result , expected )
59005968
59015969 # preserver if non-object
59025970 s = Series ([1 ], dtype = 'float32' )
5903- result = s .convert_objects (
5904- convert_dates = 'coerce' , convert_numeric = False )
5971+ result = s .convert_objects (convert_dates = 'coerce' ,
5972+ convert_numeric = False ,
5973+ convert_timedeltas = False )
59055974 assert_series_equal (result , s )
59065975
59075976 #r = s.copy()
@@ -5910,13 +5979,14 @@ def test_convert_objects(self):
59105979 #self.assertEqual(result.dtype, 'M8[ns]')
59115980
59125981 # dateutil parses some single letters into today's value as a date
5982+ expected = Series ([lib .NaT ])
59135983 for x in 'abcdefghijklmnopqrstuvwxyz' :
59145984 s = Series ([x ])
59155985 result = s .convert_objects (convert_dates = 'coerce' )
5916- assert_series_equal (result , s )
5986+ assert_series_equal (result , expected )
59175987 s = Series ([x .upper ()])
59185988 result = s .convert_objects (convert_dates = 'coerce' )
5919- assert_series_equal (result , s )
5989+ assert_series_equal (result , expected )
59205990
59215991 def test_convert_objects_preserve_bool (self ):
59225992 s = Series ([1 , True , 3 , 5 ], dtype = object )
0 commit comments