diff options
| author | Dick Marinus <dick@mrns.nl> | 2019-01-22 19:23:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 19:23:37 +0100 |
| commit | 806532b496ee7a3ffe732081ba418dd3f42986b6 (patch) | |
| tree | a0f720e28711a99151d8d6ea775dafd2dd13b3db | |
| parent | 9306d94bf0838219fe885d6fe4303aa44c8c0125 (diff) | |
| parent | 4542637effb5b1dd351d3906274b514a60bce519 (diff) | |
Merge pull request #996 from saper/pexpect_exceptions
Use pexpect.TIMEOUT instead of pexpect.exceptions.TIMEOUT
| -rw-r--r-- | changelog.rst | 1 | ||||
| -rw-r--r-- | tests/features/steps/wrappers.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.rst b/changelog.rst index 9c96f3cf..8495a782 100644 --- a/changelog.rst +++ b/changelog.rst @@ -4,6 +4,7 @@ Upcoming: Bug fixes: ---------- * Avoid error message on the server side if hstore extension is not installed in the current database (#991). (Thanks: `Marcin Cieślak`_) +* All pexpect submodules have been moved into the pexpect package as of version 3.0. Use pexpect.TIMEOUT (Thanks: `Marcin Cieślak`_) 2.0.2: ====== diff --git a/tests/features/steps/wrappers.py b/tests/features/steps/wrappers.py index b553a3f1..31e6c46d 100644 --- a/tests/features/steps/wrappers.py +++ b/tests/features/steps/wrappers.py @@ -16,7 +16,7 @@ def expect_exact(context, expected, timeout): timedout = False try: context.cli.expect_exact(expected, timeout=timeout) - except pexpect.exceptions.TIMEOUT: + except pexpect.TIMEOUT: timedout = True if timedout: # Strip color codes out of the output. |