Show More
@@ -196,11 +196,7 b' class PrettyPrinter(_PrettyPrinterBase):' | |||
|
196 | 196 | self.group_queue = GroupQueue(root_group) |
|
197 | 197 | self.indentation = 0 |
|
198 | 198 | |
|
199 |
def _break_o |
|
|
200 | while self.max_width < self.output_width + self.buffer_width: | |
|
201 | group = self.group_queue.deq() | |
|
202 | if not group: | |
|
203 | return | |
|
199 | def _break_one_group(self, group): | |
|
204 | 200 |
|
|
205 | 201 |
|
|
206 | 202 |
|
@@ -210,6 +206,13 b' class PrettyPrinter(_PrettyPrinterBase):' | |||
|
210 | 206 |
|
|
211 | 207 |
|
|
212 | 208 | |
|
209 | def _break_outer_groups(self): | |
|
210 | while self.max_width < self.output_width + self.buffer_width: | |
|
211 | group = self.group_queue.deq() | |
|
212 | if not group: | |
|
213 | return | |
|
214 | self._break_one_group(group) | |
|
215 | ||
|
213 | 216 | def text(self, obj): |
|
214 | 217 | """Add literal text to the output.""" |
|
215 | 218 | width = len(obj) |
@@ -248,6 +251,9 b' class PrettyPrinter(_PrettyPrinterBase):' | |||
|
248 | 251 | """ |
|
249 | 252 | Explicitly insert a newline into the output, maintaining correct indentation. |
|
250 | 253 | """ |
|
254 | group = self.group_queue.deq() | |
|
255 | if group: | |
|
256 | self._break_one_group(group) | |
|
251 | 257 | self.flush() |
|
252 | 258 | self.output.write(self.newline) |
|
253 | 259 | self.output.write(' ' * self.indentation) |
@@ -687,7 +693,9 b' def _repr_pprint(obj, p, cycle):' | |||
|
687 | 693 | """A pprint that just redirects to the normal repr function.""" |
|
688 | 694 | # Find newlines and replace them with p.break_() |
|
689 | 695 | output = repr(obj) |
|
690 |
|
|
|
696 | lines = output.splitlines() | |
|
697 | with p.group(): | |
|
698 | for idx, output_line in enumerate(lines): | |
|
691 | 699 | if idx: |
|
692 | 700 | p.break_() |
|
693 | 701 | p.text(output_line) |
@@ -68,11 +68,6 b' class BreakingRepr(object):' | |||
|
68 | 68 | def __repr__(self): |
|
69 | 69 | return "Breaking(\n)" |
|
70 | 70 | |
|
71 | class BreakingReprParent(object): | |
|
72 | def _repr_pretty_(self, p, cycle): | |
|
73 | with p.group(4,"TG: ",":"): | |
|
74 | p.pretty(BreakingRepr()) | |
|
75 | ||
|
76 | 71 | class BadRepr(object): |
|
77 | 72 | |
|
78 | 73 | def __repr__(self): |
@@ -151,8 +146,12 b' def test_pprint_break_repr():' | |||
|
151 | 146 | """ |
|
152 | 147 | Test that p.break_ is used in repr |
|
153 | 148 | """ |
|
154 |
output = pretty.pretty(BreakingRepr |
|
|
155 |
expected = " |
|
|
149 | output = pretty.pretty([[BreakingRepr()]]) | |
|
150 | expected = "[[Breaking(\n )]]" | |
|
151 | nt.assert_equal(output, expected) | |
|
152 | ||
|
153 | output = pretty.pretty([[BreakingRepr()]*2]) | |
|
154 | expected = "[[Breaking(\n ),\n Breaking(\n )]]" | |
|
156 | 155 | nt.assert_equal(output, expected) |
|
157 | 156 | |
|
158 | 157 | def test_bad_repr(): |
General Comments 0
You need to be logged in to leave comments.
Login now