Skip to content

Commit da08394

Browse files
jrebackjreback
committed
clean up tests
1 parent b2ac307 commit da08394

File tree

6 files changed

+55
-116
lines changed

6 files changed

+55
-116
lines changed

‎pandas/core/index.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,9 @@ def _format_attrs(self):
482482
if self.name is not None:
483483
attrs.append(('name',default_pprint(self.name)))
484484
attrs.append(('dtype',"'%s'" % self.dtype))
485+
max_seq_items = get_option('display.max_seq_items')
486+
if len(self) > max_seq_items:
487+
attrs.append(('length',len(self)))
485488
return attrs
486489

487490
def to_series(self, **kwargs):

‎pandas/tests/test_format.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2988,12 +2988,12 @@ def test_format(self):
29882988

29892989
def test_output_significant_digits(self):
29902990
# Issue #9764
2991-
2991+
29922992
# In case default display precision changes:
29932993
with pd.option_context('display.precision', 7):
29942994
# DataFrame example from issue #9764
29952995
d=pd.DataFrame({'col1':[9.999e-8, 1e-7, 1.0001e-7, 2e-7, 4.999e-7, 5e-7, 5.0001e-7, 6e-7, 9.999e-7, 1e-6, 1.0001e-6, 2e-6, 4.999e-6, 5e-6, 5.0001e-6, 6e-6]})
2996-
2996+
29972997
expected_output={
29982998
(0,6):' col1\n0 9.999000e-08\n1 1.000000e-07\n2 1.000100e-07\n3 2.000000e-07\n4 4.999000e-07\n5 5.000000e-07',
29992999
(1,6):' col1\n1 1.000000e-07\n2 1.000100e-07\n3 2.000000e-07\n4 4.999000e-07\n5 5.000000e-07',
@@ -3178,13 +3178,13 @@ def test_date_explict_date_format(self):
31783178
class TestDatetimeIndexUnicode(tm.TestCase):
31793179
def test_dates(self):
31803180
text = str(pd.to_datetime([datetime(2013,1,1), datetime(2014,1,1)]))
3181-
self.assertTrue("[2013-01-01," in text)
3182-
self.assertTrue(", 2014-01-01]" in text)
3181+
self.assertTrue("['2013-01-01'," in text)
3182+
self.assertTrue(", '2014-01-01']" in text)
31833183

31843184
def test_mixed(self):
31853185
text = str(pd.to_datetime([datetime(2013,1,1), datetime(2014,1,1,12), datetime(2014,1,1)]))
3186-
self.assertTrue("[2013-01-01 00:00:00," in text)
3187-
self.assertTrue(", 2014-01-01 00:00:00]" in text)
3186+
self.assertTrue("['2013-01-01 00:00:00'," in text)
3187+
self.assertTrue(", '2014-01-01 00:00:00']" in text)
31883188

31893189

31903190
class TestStringRepTimestamp(tm.TestCase):

‎pandas/tests/test_index.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,8 +2072,8 @@ def test_str(self):
20722072
# test the string repr
20732073
idx = self.create_index()
20742074
idx.name = 'foo'
2075-
self.assertTrue("length=%s" % len(idx) in str(idx))
2076-
self.assertTrue("u'foo'" in str(idx))
2075+
self.assertFalse("length=%s" % len(idx) in str(idx))
2076+
self.assertTrue("'foo'" in str(idx))
20772077
self.assertTrue(idx.__class__.__name__ in str(idx))
20782078

20792079
if hasattr(idx,'tz'):

‎pandas/tseries/base.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,13 @@ def argmax(self, axis=None):
255255

256256
@property
257257
def _formatter_func(self):
258-
"""
259-
Format function to convert value to representation
260-
"""
261-
return str
258+
raise AbstractMethodError(self)
262259

263260
def _format_attrs(self):
264261
"""
265262
Return a list of tuples of the (attr,formatted_value)
266263
"""
267264
attrs = super(DatetimeIndexOpsMixin, self)._format_attrs()
268-
attrs.append(('length',len(self)))
269265
for attrib in self._attributes:
270266
if attrib == 'freq':
271267
freq = self.freqstr
@@ -499,4 +495,6 @@ def summary(self, name=None):
499495
if self.freq:
500496
result += '\nFreq: %s' % self.freqstr
501497

498+
# display as values, not quoted
499+
result = result.replace("'","")
502500
return result

‎pandas/tseries/period.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,10 @@ def _to_embed(self, keep_tz=False):
293293
""" return an array repr of this object, potentially casting to object """
294294
return self.asobject.values
295295

296+
@property
297+
def _formatter_func(self):
298+
return lambda x: "'%s'" % x
299+
296300
def asof_locs(self, where, mask):
297301
"""
298302
where : array of timestamps

‎pandas/tseries/tests/test_base.py

Lines changed: 37 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -119,41 +119,17 @@ def test_representation(self):
119119
idx6 = DatetimeIndex(['2011-01-01 09:00', '2011-01-01 10:00', pd.NaT],
120120
tz='US/Eastern')
121121

122-
exp1 = """DatetimeIndex([],
123-
dtype='datetime64[ns]',
124-
length=0,
125-
freq='D',
126-
tz=None)"""
127-
128-
exp2 = """DatetimeIndex([2011-01-01],
129-
dtype='datetime64[ns]',
130-
length=1,
131-
freq='D',
132-
tz=None)"""
133-
134-
exp3 = """DatetimeIndex([2011-01-01, 2011-01-02],
135-
dtype='datetime64[ns]',
136-
length=2,
137-
freq='D',
138-
tz=None)"""
139-
140-
exp4 = """DatetimeIndex([2011-01-01, ..., 2011-01-03],
141-
dtype='datetime64[ns]',
142-
length=3,
143-
freq='D',
144-
tz=None)"""
145-
146-
exp5 = """DatetimeIndex([2011-01-01 09:00:00+09:00, ..., 2011-01-01 11:00:00+09:00],
147-
dtype='datetime64[ns]',
148-
length=3,
149-
freq='H',
150-
tz='Asia/Tokyo')"""
151-
152-
exp6 = """DatetimeIndex([2011-01-01 09:00:00-05:00, ..., NaT],
153-
dtype='datetime64[ns]',
154-
length=3,
155-
freq=None,
156-
tz='US/Eastern')"""
122+
exp1 = """DatetimeIndex([], dtype='datetime64[ns]', freq='D', tz=None)"""
123+
124+
exp2 = """DatetimeIndex(['2011-01-01'], dtype='datetime64[ns]', freq='D', tz=None)"""
125+
126+
exp3 = """DatetimeIndex(['2011-01-01', '2011-01-02'], dtype='datetime64[ns]', freq='D', tz=None)"""
127+
128+
exp4 = """DatetimeIndex(['2011-01-01', '2011-01-02', '2011-01-03'], dtype='datetime64[ns]', freq='D', tz=None)"""
129+
130+
exp5 = """DatetimeIndex(['2011-01-01 09:00:00+09:00', '2011-01-01 10:00:00+09:00', '2011-01-01 11:00:00+09:00'], dtype='datetime64[ns]', freq='H', tz='Asia/Tokyo')"""
131+
132+
exp6 = """DatetimeIndex(['2011-01-01 09:00:00-05:00', '2011-01-01 10:00:00-05:00', 'NaT'], dtype='datetime64[ns]', freq=None, tz='US/Eastern')"""
157133

158134
for idx, expected in zip([idx1, idx2, idx3, idx4, idx5, idx6],
159135
[exp1, exp2, exp3, exp4, exp5, exp6]):
@@ -390,30 +366,15 @@ def test_representation(self):
390366
idx4 = TimedeltaIndex(['1 days', '2 days', '3 days'], freq='D')
391367
idx5 = TimedeltaIndex(['1 days 00:00:01', '2 days', '3 days'])
392368

393-
exp1 = """TimedeltaIndex([],
394-
dtype='timedelta64[ns]',
395-
length=0,
396-
freq='D')"""
369+
exp1 = """TimedeltaIndex([], dtype='timedelta64[ns]', freq='D')"""
397370

398-
exp2 = """TimedeltaIndex(['1 days'],
399-
dtype='timedelta64[ns]',
400-
length=1,
401-
freq='D')"""
371+
exp2 = """TimedeltaIndex(['1 days'], dtype='timedelta64[ns]', freq='D')"""
402372

403-
exp3 = """TimedeltaIndex(['1 days', '2 days'],
404-
dtype='timedelta64[ns]',
405-
length=2,
406-
freq='D')"""
373+
exp3 = """TimedeltaIndex(['1 days', '2 days'], dtype='timedelta64[ns]', freq='D')"""
407374

408-
exp4 = """TimedeltaIndex(['1 days', ..., '3 days'],
409-
dtype='timedelta64[ns]',
410-
length=3,
411-
freq='D')"""
375+
exp4 = """TimedeltaIndex(['1 days', '2 days', '3 days'], dtype='timedelta64[ns]', freq='D')"""
412376

413-
exp5 = """TimedeltaIndex(['1 days 00:00:01', ..., '3 days 00:00:00'],
414-
dtype='timedelta64[ns]',
415-
length=3,
416-
freq=None)"""
377+
exp5 = """TimedeltaIndex(['1 days 00:00:01', '2 days 00:00:00', '3 days 00:00:00'], dtype='timedelta64[ns]', freq=None)"""
417378

418379
for idx, expected in zip([idx1, idx2, idx3, idx4, idx5],
419380
[exp1, exp2, exp3, exp4, exp5]):
@@ -431,13 +392,13 @@ def test_summary(self):
431392

432393
exp1 = """TimedeltaIndex: 0 entries
433394
Freq: D"""
434-
exp2 = """TimedeltaIndex: 1 entries, '1 days' to '1 days'
395+
exp2 = """TimedeltaIndex: 1 entries, 1 days to 1 days
435396
Freq: D"""
436-
exp3 = """TimedeltaIndex: 2 entries, '1 days' to '2 days'
397+
exp3 = """TimedeltaIndex: 2 entries, 1 days to 2 days
437398
Freq: D"""
438-
exp4 = """TimedeltaIndex: 3 entries, '1 days' to '3 days'
399+
exp4 = """TimedeltaIndex: 3 entries, 1 days to 3 days
439400
Freq: D"""
440-
exp5 = """TimedeltaIndex: 3 entries, '1 days 00:00:01' to '3 days 00:00:00'"""
401+
exp5 = """TimedeltaIndex: 3 entries, 1 days 00:00:01 to 3 days 00:00:00"""
441402

442403
for idx, expected in zip([idx1, idx2, idx3, idx4, idx5],
443404
[exp1, exp2, exp3, exp4, exp5]):
@@ -862,50 +823,23 @@ def test_representation(self):
862823
idx8 = pd.period_range('2013Q1', periods=2, freq="Q")
863824
idx9 = pd.period_range('2013Q1', periods=3, freq="Q")
864825

865-
exp1 = """PeriodIndex([],
866-
dtype='int64',
867-
length=0,
868-
freq='D')"""
869-
870-
exp2 = """PeriodIndex([2011-01-01],
871-
dtype='int64',
872-
length=1,
873-
freq='D')"""
874-
875-
exp3 = """PeriodIndex([2011-01-01, 2011-01-02],
876-
dtype='int64',
877-
length=2,
878-
freq='D')"""
879-
880-
exp4 = """PeriodIndex([2011-01-01, ..., 2011-01-03],
881-
dtype='int64',
882-
length=3,
883-
freq='D')"""
884-
885-
exp5 = """PeriodIndex([2011, ..., 2013],
886-
dtype='int64',
887-
length=3,
888-
freq='A-DEC')"""
889-
890-
exp6 = """PeriodIndex([2011-01-01 09:00, ..., NaT],
891-
dtype='int64',
892-
length=3,
893-
freq='H')"""
894-
895-
exp7 = """PeriodIndex([2013Q1],
896-
dtype='int64',
897-
length=1,
898-
freq='Q-DEC')"""
899-
900-
exp8 = """PeriodIndex([2013Q1, 2013Q2],
901-
dtype='int64',
902-
length=2,
903-
freq='Q-DEC')"""
904-
905-
exp9 = """PeriodIndex([2013Q1, ..., 2013Q3],
906-
dtype='int64',
907-
length=3,
908-
freq='Q-DEC')"""
826+
exp1 = """PeriodIndex([], dtype='int64', freq='D')"""
827+
828+
exp2 = """PeriodIndex(['2011-01-01'], dtype='int64', freq='D')"""
829+
830+
exp3 = """PeriodIndex(['2011-01-01', '2011-01-02'], dtype='int64', freq='D')"""
831+
832+
exp4 = """PeriodIndex(['2011-01-01', '2011-01-02', '2011-01-03'], dtype='int64', freq='D')"""
833+
834+
exp5 = """PeriodIndex(['2011', '2012', '2013'], dtype='int64', freq='A-DEC')"""
835+
836+
exp6 = """PeriodIndex(['2011-01-01 09:00', '2012-02-01 10:00', 'NaT'], dtype='int64', freq='H')"""
837+
838+
exp7 = """PeriodIndex(['2013Q1'], dtype='int64', freq='Q-DEC')"""
839+
840+
exp8 = """PeriodIndex(['2013Q1', '2013Q2'], dtype='int64', freq='Q-DEC')"""
841+
842+
exp9 = """PeriodIndex(['2013Q1', '2013Q2', '2013Q3'], dtype='int64', freq='Q-DEC')"""
909843

910844
for idx, expected in zip([idx1, idx2, idx3, idx4, idx5, idx6, idx7, idx8, idx9],
911845
[exp1, exp2, exp3, exp4, exp5, exp6, exp7, exp8, exp9]):

0 commit comments

Comments
 (0)