Merge pull request #1269 from Kriechi/pathod-netlib-http2

move custom HTTP/2 stack from netlib to pathod

1 files changed, 6 insertions, 6 deletions

diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index ea21b747..c6783878 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -11,18 +11,18 @@ import time
 
 import OpenSSL.crypto
 import six
+import logging
 
+from netlib.tutils import treq
+from netlib import strutils
 from netlib import tcp, certutils, websockets, socks
 from netlib import exceptions
 from netlib.http import http1
-from netlib.http import http2
 from netlib import basethread
 
-from pathod import log, language
+from . import log, language
+from .protocols import http2
 
-import logging
-from netlib.tutils import treq
-from netlib import strutils
 
 logging.getLogger("hpack").setLevel(logging.WARNING)
 
@@ -227,7 +227,7 @@ class Pathoc(tcp.TCPClient):
                     "Pathoc might not be working as expected without ALPN.",
                     timestamp=False
                 )
-            self.protocol = http2.HTTP2Protocol(self, dump_frames=self.http2_framedump)
+            self.protocol = http2.HTTP2StateProtocol(self, dump_frames=self.http2_framedump)
         else:
             self.protocol = http1