| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -219,12 +219,17 @@ def interact(self, banner=None, exitmsg=None): | |||
| 219 | 219 | """ | |
| 220 | 220 | try: | |
| 221 | 221 | sys.ps1 | |
| 222 | + delete_ps1_after = False | ||
| 222 | 223 | except AttributeError: | |
| 223 | 224 | sys.ps1 = ">>> " | |
| 225 | + delete_ps1_after = True | ||
| 224 | 226 | try: | |
| 225 | - sys.ps2 | ||
| 227 | + _ps2 = sys.ps2 | ||
| 228 | + delete_ps2_after = False | ||
| 226 | 229 | except AttributeError: | |
| 227 | 230 | sys.ps2 = "... " | |
| 231 | + delete_ps2_after = True | ||
| 232 | + | ||
| 228 | 233 | cprt = 'Type "help", "copyright", "credits" or "license" for more information.' | |
| 229 | 234 | if banner is None: | |
| 230 | 235 | self.write("Python %s on %s\n%s\n(%s)\n" % | |
@@ -287,6 +292,12 @@ def interact(self, banner=None, exitmsg=None): | |||
| 287 | 292 | if _quit is not None: | |
| 288 | 293 | builtins.quit = _quit | |
| 289 | 294 | ||
| 295 | + if delete_ps1_after: | ||
| 296 | + del sys.ps1 | ||
| 297 | + | ||
| 298 | + if delete_ps2_after: | ||
| 299 | + del sys.ps2 | ||
| 300 | + | ||
| 290 | 301 | if exitmsg is None: | |
| 291 | 302 | self.write('now exiting %s...\n' % self.__class__.__name__) | |
| 292 | 303 | elif exitmsg != '': | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -39,19 +39,47 @@ def setUp(self): | |||
| 39 | 39 | self.mock_sys() | |
| 40 | 40 | ||
| 41 | 41 | def test_ps1(self): | |
| 42 | - self.infunc.side_effect = EOFError('Finished') | ||
| 42 | + self.infunc.side_effect = [ | ||
| 43 | + "import code", | ||
| 44 | + "code.sys.ps1", | ||
| 45 | + EOFError('Finished') | ||
| 46 | + ] | ||
| 43 | 47 | self.console.interact() | |
| 44 | - self.assertEqual(self.sysmod.ps1, '>>> ') | ||
| 48 | + output = ''.join(''.join(call[1]) for call in self.stdout.method_calls) | ||
| 49 | + self.assertIn('>>> ', output) | ||
| 50 | + self.assertNotHasAttr(self.sysmod, 'ps1') | ||
| 51 | + | ||
| 52 | + self.infunc.side_effect = [ | ||
| 53 | + "import code", | ||
| 54 | + "code.sys.ps1", | ||
| 55 | + EOFError('Finished') | ||
| 56 | + ] | ||
| 45 | 57 | self.sysmod.ps1 = 'custom1> ' | |
| 46 | 58 | self.console.interact() | |
| 59 | + output = ''.join(''.join(call[1]) for call in self.stdout.method_calls) | ||
| 60 | + self.assertIn('custom1> ', output) | ||
| 47 | 61 | self.assertEqual(self.sysmod.ps1, 'custom1> ') | |
| 48 | 62 | ||
| 49 | 63 | def test_ps2(self): | |
| 50 | - self.infunc.side_effect = EOFError('Finished') | ||
| 64 | + self.infunc.side_effect = [ | ||
| 65 | + "import code", | ||
| 66 | + "code.sys.ps2", | ||
| 67 | + EOFError('Finished') | ||
| 68 | + ] | ||
| 51 | 69 | self.console.interact() | |
| 52 | - self.assertEqual(self.sysmod.ps2, '... ') | ||
| 70 | + output = ''.join(''.join(call[1]) for call in self.stdout.method_calls) | ||
| 71 | + self.assertIn('... ', output) | ||
| 72 | + self.assertNotHasAttr(self.sysmod, 'ps2') | ||
| 73 | + | ||
| 74 | + self.infunc.side_effect = [ | ||
| 75 | + "import code", | ||
| 76 | + "code.sys.ps2", | ||
| 77 | + EOFError('Finished') | ||
| 78 | + ] | ||
| 53 | 79 | self.sysmod.ps2 = 'custom2> ' | |
| 54 | 80 | self.console.interact() | |
| 81 | + output = ''.join(''.join(call[1]) for call in self.stdout.method_calls) | ||
| 82 | + self.assertIn('custom2> ', output) | ||
| 55 | 83 | self.assertEqual(self.sysmod.ps2, 'custom2> ') | |
| 56 | 84 | ||
| 57 | 85 | def test_console_stderr(self): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + ``sys.ps1`` and ``sys.ps2`` are now restored after :func:`code.interact` call. | ||
| Back | FazBrowse Home | New Git URL |
0 commit comments