From 906360f63f2afb4991dd2b38528798ad4efd0618 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Thu, 17 Sep 2015 15:16:33 +0200
Subject: code -> status_code, httpversion -> http_version

---
 libmproxy/console/common.py   | 4 ++--
 libmproxy/console/flowview.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libmproxy/console')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 13374b25..4a2310c9 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -393,7 +393,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2,
         req_url = f.request.pretty_url(hostheader=hostheader),
 
         err_msg = f.error.msg if f.error else None,
-        resp_code = f.response.code if f.response else None,
+        resp_code = f.response.status_code if f.response else None,
 
         marked = marked,
     )
@@ -410,7 +410,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2,
         roundtrip = utils.pretty_duration(duration)
 
         d.update(dict(
-            resp_code = f.response.code,
+            resp_code = f.response.status_code,
             resp_is_replay = f.response.is_replay,
             resp_clen = contentdesc,
             roundtrip = roundtrip,
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 8220c1e7..a95f23a3 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -298,7 +298,7 @@ class FlowView(tabs.Tabs):
     def set_resp_code(self, code):
         response = self.flow.response
         try:
-            response.code = int(code)
+            response.status_code = int(code)
         except ValueError:
             return None
         import BaseHTTPServer
@@ -357,7 +357,7 @@ class FlowView(tabs.Tabs):
         else:
             if not self.flow.response:
                 self.flow.response = HTTPResponse(
-                    self.flow.request.httpversion,
+                    self.flow.request.http_version,
                     200, "OK", Headers(), ""
                 )
                 self.flow.response.reply = controller.DummyReply()
@@ -447,7 +447,7 @@ class FlowView(tabs.Tabs):
         elif part == "o":
             signals.status_prompt.send(
                 prompt = "Code",
-                text = str(message.code),
+                text = str(message.status_code),
                 callback = self.set_resp_code
             )
         elif part == "m":
-- 
cgit v1.2.3