aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-05-11 13:27:58 -0500
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-05-11 13:27:58 -0500
commitbbf7b6f690fd61af5900df924b833140dc21daee (patch)
tree28ffc3a67f93cecb853ad82c867a5f12e33765ba
parentbef72c1b02a4f6e374224279506bde17ce2f79db (diff)
parentacab4fea5a8f2858922a2a92ba4d7b6cf63df88a (diff)
downloadmitmproxy-bbf7b6f690fd61af5900df924b833140dc21daee.tar.gz
mitmproxy-bbf7b6f690fd61af5900df924b833140dc21daee.tar.bz2
mitmproxy-bbf7b6f690fd61af5900df924b833140dc21daee.zip
Merge pull request #1134 from mhils/fix-versions
Fix `version.NAME`
-rw-r--r--mitmproxy/version.py5
-rw-r--r--pathod/version.py5
2 files changed, 8 insertions, 2 deletions
diff --git a/mitmproxy/version.py b/mitmproxy/version.py
index 63f60a8d..da1e7229 100644
--- a/mitmproxy/version.py
+++ b/mitmproxy/version.py
@@ -1,3 +1,6 @@
from __future__ import (absolute_import, print_function, division)
-from netlib.version import * \ No newline at end of file
+from netlib.version import VERSION, IVERSION
+
+NAME = "mitmproxy"
+NAMEVERSION = NAME + " " + VERSION
diff --git a/pathod/version.py b/pathod/version.py
index 63f60a8d..2da7637d 100644
--- a/pathod/version.py
+++ b/pathod/version.py
@@ -1,3 +1,6 @@
from __future__ import (absolute_import, print_function, division)
-from netlib.version import * \ No newline at end of file
+from netlib.version import VERSION, IVERSION
+
+NAME = "pathod"
+NAMEVERSION = NAME + " " + VERSION