Fold mitmproxy.version and pathod.version into netlib.version

8 files changed, 13 insertions, 24 deletions

diff --git a/mitmproxy/cmdline.py b/mitmproxy/cmdline.py
index 4727e263..77cdb8ca 100644
--- a/mitmproxy/cmdline.py
+++ b/mitmproxy/cmdline.py
@@ -7,10 +7,10 @@ import re
 import configargparse
 
 from mitmproxy import filt
-from mitmproxy import version
 from mitmproxy.proxy import config
 from netlib import human
 from netlib import tcp
+from netlib import version
 from netlib.http import url
 
 APP_HOST = "mitm.it"
diff --git a/mitmproxy/console/help.py b/mitmproxy/console/help.py
index 26cb4ed3..064d3cb5 100644
--- a/mitmproxy/console/help.py
+++ b/mitmproxy/console/help.py
@@ -3,10 +3,11 @@ from __future__ import absolute_import, print_function, division
 import urwid
 
 from mitmproxy import filt
-from mitmproxy import version
 from mitmproxy.console import common
 from mitmproxy.console import signals
 
+from netlib import version
+
 footer = [
     ("heading", 'mitmproxy v%s ' % version.VERSION),
     ('heading_key', "q"), ":back ",
diff --git a/mitmproxy/flow/io_compat.py b/mitmproxy/flow/io_compat.py
index 7522163f..1023e87f 100644
--- a/mitmproxy/flow/io_compat.py
+++ b/mitmproxy/flow/io_compat.py
@@ -3,7 +3,7 @@ This module handles the import of mitmproxy flows generated by old versions.
 """
 from __future__ import absolute_import, print_function, division
 
-from mitmproxy import version
+from netlib import version
 
 
 def convert_013_014(data):
@@ -66,6 +66,6 @@ def migrate_flow(flow_data):
         else:
             v = ".".join(str(i) for i in flow_data["version"])
             raise ValueError(
-                "{} cannot read files serialized with version {}.".format(version.NAMEVERSION, v)
+                "{} cannot read files serialized with version {}.".format(version.MITMPROXY, v)
             )
     return flow_data
diff --git a/mitmproxy/flow/modules.py b/mitmproxy/flow/modules.py
index 601ebfce..2998d259 100644
--- a/mitmproxy/flow/modules.py
+++ b/mitmproxy/flow/modules.py
@@ -9,8 +9,8 @@ from six.moves import urllib
 
 from mitmproxy import controller
 from mitmproxy import filt
-from mitmproxy import version
 from netlib import wsgi
+from netlib import version
 from netlib.http import cookies
 from netlib.http import http1
 
@@ -28,7 +28,7 @@ class AppRegistry:
             app,
             domain,
             port,
-            version.NAMEVERSION
+            version.MITMPROXY
         )
 
     def get(self, request):
diff --git a/mitmproxy/models/flow.py b/mitmproxy/models/flow.py
index de86e451..0e4f80cb 100644
--- a/mitmproxy/models/flow.py
+++ b/mitmproxy/models/flow.py
@@ -5,10 +5,11 @@ import copy
 import uuid
 
 from mitmproxy import stateobject
-from mitmproxy import version
 from mitmproxy.models.connections import ClientConnection
 from mitmproxy.models.connections import ServerConnection
 
+from netlib import version
+
 
 class Error(stateobject.StateObject):
 
diff --git a/mitmproxy/models/http.py b/mitmproxy/models/http.py
index a32124ac..01f5f1ee 100644
--- a/mitmproxy/models/http.py
+++ b/mitmproxy/models/http.py
@@ -2,9 +2,9 @@ from __future__ import absolute_import, print_function, division
 
 import cgi
 
-from mitmproxy import version
 from mitmproxy.models.flow import Flow
 from netlib import encoding
+from netlib import version
 from netlib.http import Headers
 from netlib.http import Request
 from netlib.http import Response
@@ -258,7 +258,7 @@ def make_error_response(status_code, message, headers=None):
 
     if not headers:
         headers = Headers(
-            Server=version.NAMEVERSION,
+            Server=version.MITMPROXY,
             Connection="close",
             Content_Length=str(len(body)),
             Content_Type="text/html"
diff --git a/mitmproxy/version.py b/mitmproxy/version.py
deleted file mode 100644
index 0ebb0829..00000000
--- a/mitmproxy/version.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import absolute_import, print_function, division
-
-from netlib.version import VERSION, IVERSION
-
-NAME = "mitmproxy"
-NAMEVERSION = NAME + " " + VERSION
-
-__all__ = [
-    "NAME",
-    "NAMEVERSION",
-    "VERSION",
-    "IVERSION",
-]
diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py
index 2ba97b8d..27415619 100644
--- a/mitmproxy/web/app.py
+++ b/mitmproxy/web/app.py
@@ -12,7 +12,7 @@ from io import BytesIO
 from mitmproxy.flow import FlowWriter, FlowReader
 
 from mitmproxy import filt
-from mitmproxy import version
+from netlib import version
 
 
 def _strip_content(flow_state):
@@ -72,7 +72,7 @@ class RequestHandler(BasicAuth, tornado.web.RequestHandler):
 
     def set_default_headers(self):
         super(RequestHandler, self).set_default_headers()
-        self.set_header("Server", version.NAMEVERSION)
+        self.set_header("Server", version.MITMPROXY)
         self.set_header("X-Frame-Options", "DENY")
         self.add_header("X-XSS-Protection", "1; mode=block")
         self.add_header("X-Content-Type-Options", "nosniff")