code -> status_code, httpversion -> http_version

2 files changed, 18 insertions, 18 deletions

diff --git a/libpathod/language/http.py b/libpathod/language/http.py
index bb9db3c0..a82f12fe 100644
--- a/libpathod/language/http.py
+++ b/libpathod/language/http.py
@@ -23,7 +23,7 @@ class Path(base.Value):
     pass
 
 
-class Code(base.Integer):
+class StatusCode(base.Integer):
     pass
 
 
@@ -155,15 +155,15 @@ class Response(_HTTPMessage):
         actions.DisconnectAt,
         actions.InjectAt,
     )
-    logattrs = ["code", "reason", "version", "body"]
+    logattrs = ["status_code", "reason", "version", "body"]
 
     @property
     def ws(self):
         return self.tok(WS)
 
     @property
-    def code(self):
-        return self.tok(Code)
+    def status_code(self):
+        return self.tok(StatusCode)
 
     @property
     def reason(self):
@@ -171,15 +171,15 @@ class Response(_HTTPMessage):
 
     def preamble(self, settings):
         l = [self.version, " "]
-        l.extend(self.code.values(settings))
-        code = int(self.code.value)
+        l.extend(self.status_code.values(settings))
+        status_code = int(self.status_code.value)
         l.append(" ")
         if self.reason:
             l.extend(self.reason.values(settings))
         else:
             l.append(
                 status_codes.RESPONSES.get(
-                    code,
+                    status_code,
                     "Unknown code"
                 )
             )
@@ -192,10 +192,10 @@ class Response(_HTTPMessage):
                 raise exceptions.RenderError(
                     "No websocket key - have we seen a client handshake?"
                 )
-            if not self.code:
+            if not self.status_code:
                 tokens.insert(
                     1,
-                    Code(101)
+                    StatusCode(101)
                 )
             headers = netlib.websockets.WebsocketsProtocol.server_handshake_headers(
                 settings.websocket_key
@@ -235,9 +235,9 @@ class Response(_HTTPMessage):
                 pp.MatchFirst(
                     [
                         WS.expr() + pp.Optional(
-                            base.Sep + Code.expr()
+                            base.Sep + StatusCode.expr()
                         ),
-                        Code.expr(),
+                        StatusCode.expr(),
                     ]
                 ),
                 pp.ZeroOrMore(base.Sep + atom)
@@ -370,7 +370,7 @@ class Request(_HTTPMessage):
 
 def make_error_response(reason, body=None):
     tokens = [
-        Code("800"),
+        StatusCode("800"),
         Header(
             base.TokValueLiteral("Content-Type"),
             base.TokValueLiteral("text/plain")
diff --git a/libpathod/language/http2.py b/libpathod/language/http2.py
index 829a05db..d5e3ca31 100644
--- a/libpathod/language/http2.py
+++ b/libpathod/language/http2.py
@@ -83,7 +83,7 @@ class _HTTP2Message(message.Message):
         return self
 
 
-class Code(base.Integer):
+class StatusCode(base.Integer):
     pass
 
 
@@ -159,8 +159,8 @@ class Response(_HTTP2Message):
         self.stream_id = 2
 
     @property
-    def code(self):
-        return self.tok(Code)
+    def status_code(self):
+        return self.tok(StatusCode)
 
     @classmethod
     def expr(cls):
@@ -168,7 +168,7 @@ class Response(_HTTP2Message):
         atom = pp.MatchFirst(parts)
         resp = pp.And(
             [
-                Code.expr(),
+                StatusCode.expr(),
                 pp.ZeroOrMore(base.Sep + atom)
             ]
         )
@@ -187,7 +187,7 @@ class Response(_HTTP2Message):
 
             resp = http.Response(
                 (2, 0),
-                self.code.string(),
+                self.status_code.string(),
                 '',
                 headers,
                 body,
@@ -289,7 +289,7 @@ class Request(_HTTP2Message):
 
 def make_error_response(reason, body=None):
     tokens = [
-        Code("800"),
+        StatusCode("800"),
         Body(base.TokValueLiteral("pathod error: " + (body or reason))),
     ]
     return Response(tokens)