diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2016-02-04 10:51:18 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2016-02-04 10:51:18 +0100 |
| commit | 023026e032f7f78a53a598eb7bd130d1b14930d2 (patch) | |
| tree | 01982db6659f75f2bfe737a81b82022550e48e28 /libmproxy/controller.py | |
| parent | ae4a1dd6dec9d95e450837db8937e3fb7604c121 (diff) | |
| parent | 98f54d21b6156ceaa8450072be9f53dfde137248 (diff) | |
| download | mitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.tar.gz mitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.tar.bz2 mitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.zip | |
Merge pull request #883 from mitmproxy/hyper-h2
HTTP/2: Implementation using hyper-h2
Diffstat (limited to 'libmproxy/controller.py')
| -rw-r--r-- | libmproxy/controller.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 712ab1d2..9a059856 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -56,7 +56,7 @@ class Channel: try: # The timeout is here so we can handle a should_exit event. g = m.reply.q.get(timeout=0.5) - except Queue.Empty: # pragma: nocover + except Queue.Empty: # pragma: no cover continue return g |