Mercurial > hg
comparison hgext/color.py @ 27110:f04bd381e8c0
ui: avoid needless casting to a str
In many cases, we don't need to cast to a str because the object will
be cast when it is eventually written.
As part of testing this, I added some code to raise exceptions when a
non-str was passed in and wasn't able to trigger it. i.e. we're already
passing str into this function everywhere, so the casting isn't
necessary.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sun, 22 Nov 2015 14:44:55 -0800 |
| parents | a93d53f79e6e |
| children | 290b41913d9f |
comparison
equal
deleted
inserted
replaced
| 27109:a93d53f79e6e | 27110:f04bd381e8c0 |
|---|---|
| 432 return super(colorui, self).write(*args, **opts) | 432 return super(colorui, self).write(*args, **opts) |
| 433 | 433 |
| 434 label = opts.get('label', '') | 434 label = opts.get('label', '') |
| 435 if self._buffers: | 435 if self._buffers: |
| 436 if self._bufferapplylabels: | 436 if self._bufferapplylabels: |
| 437 self._buffers[-1].extend(self.label(str(a), label) | 437 self._buffers[-1].extend(self.label(a, label) for a in args) |
| 438 for a in args) | |
| 439 else: | 438 else: |
| 440 self._buffers[-1].extend(str(a) for a in args) | 439 self._buffers[-1].extend(args) |
| 441 elif self._colormode == 'win32': | 440 elif self._colormode == 'win32': |
| 442 for a in args: | 441 for a in args: |
| 443 win32print(a, super(colorui, self).write, **opts) | 442 win32print(a, super(colorui, self).write, **opts) |
| 444 else: | 443 else: |
| 445 return super(colorui, self).write( | 444 return super(colorui, self).write( |
| 446 *[self.label(str(a), label) for a in args], **opts) | 445 *[self.label(a, label) for a in args], **opts) |
| 447 | 446 |
| 448 def write_err(self, *args, **opts): | 447 def write_err(self, *args, **opts): |
| 449 if self._colormode is None: | 448 if self._colormode is None: |
| 450 return super(colorui, self).write_err(*args, **opts) | 449 return super(colorui, self).write_err(*args, **opts) |
| 451 | 450 |
| 455 if self._colormode == 'win32': | 454 if self._colormode == 'win32': |
| 456 for a in args: | 455 for a in args: |
| 457 win32print(a, super(colorui, self).write_err, **opts) | 456 win32print(a, super(colorui, self).write_err, **opts) |
| 458 else: | 457 else: |
| 459 return super(colorui, self).write_err( | 458 return super(colorui, self).write_err( |
| 460 *[self.label(str(a), label) for a in args], **opts) | 459 *[self.label(a, label) for a in args], **opts) |
| 461 | 460 |
| 462 def showlabel(self, msg, label): | 461 def showlabel(self, msg, label): |
| 463 if label and msg: | 462 if label and msg: |
| 464 if msg[-1] == '\n': | 463 if msg[-1] == '\n': |
| 465 return "[%s|%s]\n" % (label, msg[:-1]) | 464 return "[%s|%s]\n" % (label, msg[:-1]) |