Skip to content

Commit b784464

Browse files
committed
more mods
1 parent 9dc0cf9 commit b784464

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

doc/source/whatsnew/v0.16.1.txt

+3
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,9 @@ New Behavior
288288
pd.Index(range(4),name='foo')
289289
pd.Index(range(25),name='foo')
290290
pd.Index(range(104),name='foo')
291+
pd.CategoricalIndex(['a','bb','ccc','dddd'],ordered=True,name='foobar')
292+
pd.CategoricalIndex(['a','bb','ccc','dddd']*10,ordered=True,name='foobar')
293+
pd.CategoricalIndex(['a','bb','ccc','dddd']*100,ordered=True,name='foobar')
291294
pd.date_range('20130101',periods=4,name='foo',tz='US/Eastern')
292295
pd.date_range('20130101',periods=25,name='foo',tz='US/Eastern')
293296
pd.date_range('20130101',periods=104,name='foo',tz='US/Eastern')

pandas/core/index.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -487,14 +487,20 @@ def best_fit(values, max_len, justify=False):
487487
elif n > max_seq_items:
488488
n = min(max_seq_items//2,10)
489489

490-
head = [ formatter(x) for x in self[:n] ]
491-
tail = [ formatter(x) for x in self[-n:] ]
492-
max_len = max(best_len(head),best_len(tail))
490+
head1 = [ formatter(x) for x in self[:n] ]
491+
head2 = [ formatter(x) for x in self[n:(2*n)] ]
492+
tail1 = [ formatter(x) for x in self[-(2*n):-n] ]
493+
tail2 = [ formatter(x) for x in self[-n:] ]
494+
max_len = max([ best_len(x) for x in [head1, head2, tail1, tail2]])
493495

494496
summary = '['
495-
summary += best_fit(head, max_len, justify=True)
497+
summary += best_fit(head1, max_len)
498+
summary += ',' + space2
499+
summary += best_fit(head2, max_len)
496500
summary += ',' + space1 + ' ...' + space2
497-
summary += best_fit(tail, max_len, justify=True)
501+
summary += best_fit(tail1, max_len)
502+
summary += ',' + space2
503+
summary += best_fit(tail2, max_len)
498504
summary += '],'
499505
summary += space1
500506

pandas/tests/test_index.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2463,7 +2463,7 @@ def test_print_unicode_columns(self):
24632463
def test_repr_summary(self):
24642464
with cf.option_context('display.max_seq_items', 10):
24652465
r = repr(pd.Index(np.arange(1000)))
2466-
self.assertTrue(len(r) < 150)
2466+
self.assertTrue(len(r) < 200)
24672467
self.assertTrue("..." in r)
24682468

24692469
def test_repr_roundtrip(self):

0 commit comments

Comments
 (0)