diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-09 12:35:38 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-09 12:36:14 +1300 |
commit | 592812467da5bfe8196f16dcfa6d348551c4febd (patch) | |
tree | 7509824eb99cc6efd552993241db76be32b516f1 | |
parent | 897c4bfc5268f53a9a78219de8a7d2cc6c151f8d (diff) | |
download | mitmproxy-592812467da5bfe8196f16dcfa6d348551c4febd.tar.gz mitmproxy-592812467da5bfe8196f16dcfa6d348551c4febd.tar.bz2 mitmproxy-592812467da5bfe8196f16dcfa6d348551c4febd.zip |
Move version constants to version.py, add version to serialized flows.
For now, we don't do anything with the serialized version info, but this should
give us some future-proofing for serialization format changes.
-rw-r--r-- | libmproxy/__init__.py | 1 | ||||
-rw-r--r-- | libmproxy/flow.py | 3 | ||||
-rw-r--r-- | libmproxy/version.py | 2 | ||||
-rwxr-xr-x | mitmdump | 4 | ||||
-rwxr-xr-x | mitmproxy | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/libmproxy/__init__.py b/libmproxy/__init__.py index 2bbcaaf5..e69de29b 100644 --- a/libmproxy/__init__.py +++ b/libmproxy/__init__.py @@ -1 +0,0 @@ -VERSION = "0.3" diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 957d5301..dff58fa0 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -4,7 +4,7 @@ """ import subprocess, base64, sys, json, hashlib, Cookie, cookielib, copy import proxy, threading, netstring, filt -import controller +import controller, version class RunException(Exception): def __init__(self, msg, returncode, errout): @@ -230,6 +230,7 @@ class Flow: request = self.request.get_state() if self.request else None, response = self.response.get_state() if self.response else None, error = self.error.get_state() if self.error else None, + version = version.IVERSION ) if nobackup: d["backup"] = None diff --git a/libmproxy/version.py b/libmproxy/version.py new file mode 100644 index 00000000..35c6e8de --- /dev/null +++ b/libmproxy/version.py @@ -0,0 +1,2 @@ +IVERSION = (0, 3) +VERSION = ".".join([str(i) for i in IVERSION]) @@ -17,9 +17,7 @@ import sys, os.path from libmproxy import proxy, dump, utils -from libmproxy import VERSION - - +from libmproxy.version import VERSION from optparse import OptionParser, OptionGroup @@ -17,7 +17,7 @@ import sys, os.path from libmproxy import proxy, controller, console, utils -from libmproxy import VERSION +from libmproxy.version import VERSION from optparse import OptionParser, OptionGroup |