diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-01-10 01:00:52 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-01-10 01:00:52 (GMT) |
| commit | ef41a6e48ba1f29daf762e5a8624a6b44fe97fa8 (patch) | |
| tree | d5671a2e4414eae5c6ee36d529068f21e8592f57 | |
| parent | 3b10a27fab8a646c499c38630b1d27d64ae8b1c3 (diff) | |
| download | SCons-ef41a6e48ba1f29daf762e5a8624a6b44fe97fa8.zip SCons-ef41a6e48ba1f29daf762e5a8624a6b44fe97fa8.tar.gz SCons-ef41a6e48ba1f29daf762e5a8624a6b44fe97fa8.tar.bz2 | |
Resolve mwichmann's commments on PR removing extraneous code
| -rw-r--r-- | src/engine/SCons/Taskmaster.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/UtilTests.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py index 7363915..1e5776c 100644 --- a/src/engine/SCons/Taskmaster.py +++ b/src/engine/SCons/Taskmaster.py @@ -792,7 +792,7 @@ class Taskmaster(object): self.ready_exc = None T = self.trace - if T: T.write(str('\n') + self.trace_message('Looking for a node to evaluate')) + if T: T.write('\n' + self.trace_message('Looking for a node to evaluate')) while True: node = self.next_candidate() diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py index 3e700c9..ee07e61 100644 --- a/src/engine/SCons/UtilTests.py +++ b/src/engine/SCons/UtilTests.py @@ -311,8 +311,8 @@ class UtilTestCase(unittest.TestCase): def test_to_Bytes(self): """ Test the to_Bytes method""" - self.assertEqual(to_bytes(str('Hello')), - bytearray(u'Hello', 'utf-8'), + self.assertEqual(to_bytes('Hello'), + bytearray('Hello', 'utf-8'), "Check that to_bytes creates byte array when presented with unicode string.") def test_to_String(self): |