summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Cieślak <saper@saper.info>2019-01-21 09:22:00 +0000
committerMarcin Cieślak <saper@saper.info>2019-01-22 00:05:20 +0000
commit4542637effb5b1dd351d3906274b514a60bce519 (patch)
tree8342e9b4093cdb95ba31a08baf735b0d24de97f1
parentef8aac61c476bd46747d3d4910a4d494a59fa375 (diff)
Use pexpect.TIMEOUT instead of pexpect.exceptions.TIMEOUT
All pexpect submodules have been moved into the pexpect package as of version 3.0.
-rw-r--r--changelog.rst1
-rw-r--r--tests/features/steps/wrappers.py2
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.