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.

libmproxy/__init__.py

@@ -1 +0,0 @@
-VERSION = "0.3"

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

libmproxy/version.py

@@ -0,0 +1,2 @@
+IVERSION = (0, 3)
+VERSION = ".".join([str(i) for i in IVERSION])

mitmdump

@@ -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
 
 

mitmproxy

@@ -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