Merge branch 'master' into appveyor

5 files changed, 15 insertions, 21 deletions

diff --git a/pathod/pathoc_cmdline.py b/pathod/pathoc_cmdline.py
index 1f438cd7..21d0efc6 100644
--- a/pathod/pathoc_cmdline.py
+++ b/pathod/pathoc_cmdline.py
@@ -5,8 +5,9 @@ import os
 import os.path
 
 from netlib import tcp
+from netlib import version
 from netlib.http import user_agents
-from . import pathoc, version, language
+from . import pathoc, language
 
 
 def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr):
diff --git a/pathod/pathod.py b/pathod/pathod.py
index d1cc9980..315a04e0 100644
--- a/pathod/pathod.py
+++ b/pathod/pathod.py
@@ -6,11 +6,14 @@ import sys
 import threading
 import urllib
 
-from netlib import tcp, certutils, websockets
+from netlib import tcp
+from netlib import certutils
+from netlib import websockets
+from netlib import version
 from netlib.exceptions import HttpException, HttpReadDisconnect, TcpTimeout, TcpDisconnect, \
     TlsException
 
-from . import version, language, utils, log, protocols
+from . import language, utils, log, protocols
 
 
 DEFAULT_CERT_DOMAIN = "pathod.net"
@@ -486,7 +489,7 @@ def main(args):  # pragma: no cover
 
     try:
         print("%s listening on %s" % (
-            version.NAMEVERSION,
+            version.PATHOD,
             repr(pd.address)
         ))
         pd.serve_forever()
diff --git a/pathod/pathod_cmdline.py b/pathod/pathod_cmdline.py
index 5bb0cdd3..3531b8f3 100644
--- a/pathod/pathod_cmdline.py
+++ b/pathod/pathod_cmdline.py
@@ -4,8 +4,10 @@ import os
 import os.path
 import re
 
-from netlib import tcp, human
-from . import pathod, version
+from netlib import tcp
+from netlib import human
+from netlib import version
+from . import pathod
 
 
 def parse_anchor_spec(s):
diff --git a/pathod/protocols/http.py b/pathod/protocols/http.py
index 6eefb34f..7736df4b 100644
--- a/pathod/protocols/http.py
+++ b/pathod/protocols/http.py
@@ -1,6 +1,7 @@
+from netlib import version
 from netlib.exceptions import TlsException
 from netlib.http import http1
-from .. import version, language
+from .. import language
 
 
 class HTTPProtocol(object):
@@ -17,7 +18,7 @@ class HTTPProtocol(object):
 
         self.pathod_handler.wfile.write(
             'HTTP/1.1 200 Connection established\r\n' +
-            ('Proxy-agent: %s\r\n' % version.NAMEVERSION) +
+            ('Proxy-agent: %s\r\n' % version.PATHOD) +
             '\r\n'
         )
         self.pathod_handler.wfile.flush()
diff --git a/pathod/version.py b/pathod/version.py
deleted file mode 100644
index 3441be92..00000000
--- a/pathod/version.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import (absolute_import, print_function, division)
-
-from netlib.version import VERSION, IVERSION
-
-NAME = "pathod"
-NAMEVERSION = NAME + " " + VERSION
-
-__all__ = [
-    "NAME",
-    "NAMEVERSION",
-    "VERSION",
-    "IVERSION",
-]