Merge commit '201faa3'

pappyproxy/interface/repeater/repeater.py

@@ -11,9 +11,9 @@ import vim
 import threading
 
 from collections import namedtuple
-from urlparse import urlparse, ParseResult, parse_qs
-from urllib import urlencode
-import Cookie as hcookies
+from urllib.parse import urlparse, ParseResult, parse_qs
+from urllib.parse import urlencode
+import http.cookies as hcookies
 
 ## STRIPPED DOWN COPY OF HTTP OBJECTS / COMMS
 
@@ -1449,6 +1449,7 @@ def parse_rsp_sline(sline):
     return ResponseStatusLine(int(pmajor), int(pminor), int(status_code), reason.decode())
 
 def _parse_message(bs, sline_parser):
+    bs = bs.encode()
     header_env, body = re.split(b"\r?\n\r?\n", bs, 1)
     status_line, header_bytes = re.split(b"\r?\n", header_env, 1)
     h = Headers()
@@ -1502,7 +1503,7 @@ def run_command(command):
 def set_buffer_content(buf, text):
     buf[:] = None
     first = True
-    for l in text.split('\n'):
+    for l in text.split(b'\n'):
         if first:
             buf[0] = l
             first = False

pappyproxy/interface/repeater/repeater.vim

@@ -1,4 +1,4 @@
-if !has('python')
+ if !has('python3')
      echo "Vim must support python in order to use the repeater"
      finish
  endif
@@ -9,7 +9,7 @@ set hidden
 let s:pyscript = resolve(expand('<sfile>:p:h') . '/repeater.py')
 
 function! RepeaterAction(...)
-    execute 'pyfile ' . s:pyscript
+    execute 'py3file ' . s:pyscript
 endfunc
 
 command! -nargs=* RepeaterSetup call RepeaterAction('setup', <f-args>)