diff options
-rw-r--r-- | mitmproxy/contrib/wbxml/ASCommandResponse.py | 2 | ||||
-rw-r--r-- | mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py | 2 | ||||
-rw-r--r-- | mitmproxy/contrib/wbxml/ASWBXMLCodePage.py | 4 | ||||
-rw-r--r-- | mitmproxy/version.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mitmproxy/contrib/wbxml/ASCommandResponse.py b/mitmproxy/contrib/wbxml/ASCommandResponse.py index f5f62e85..4eea05a3 100644 --- a/mitmproxy/contrib/wbxml/ASCommandResponse.py +++ b/mitmproxy/contrib/wbxml/ASCommandResponse.py @@ -41,7 +41,7 @@ class ASCommandResponse: raise ValueError("Empty WBXML body passed") except Exception as e: self.xmlString = None - raise ValueError("Error: {0}".format(e.message)) + raise ValueError("Error: {0}".format(e)) def getWBXMLBytes(self): return self.wbxmlBytes diff --git a/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py b/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py index b616028c..0174eb4f 100644 --- a/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py +++ b/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py @@ -40,7 +40,7 @@ class ASWBXMLByteQueue(Queue): Queue.__init__(self) for byte in wbxmlBytes: - self.put(ord(byte)) + self.put(byte) self.bytesEnqueued += 1 diff --git a/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py b/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py index 1d00afd4..da84a85e 100644 --- a/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py +++ b/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py @@ -39,12 +39,12 @@ class ASWBXMLCodePage: self.tagLookup[tag] = token def getToken(self, tag): - if self.tagLookup.has_key(tag): + if tag in self.tagLookup: return self.tagLookup[tag] return 0xFF def getTag(self, token): - if self.tokenLookup.has_key(token): + if token in self.tokenLookup: return self.tokenLookup[token] return None diff --git a/mitmproxy/version.py b/mitmproxy/version.py index d9b88e7b..d23b2d19 100644 --- a/mitmproxy/version.py +++ b/mitmproxy/version.py @@ -1,4 +1,4 @@ -IVERSION = (3, 0, 0, 'dev') +IVERSION = (3, 0, 0) VERSION = ".".join(str(i) for i in IVERSION) PATHOD = "pathod " + VERSION MITMPROXY = "mitmproxy " + VERSION |