Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/mitmproxy/files: mitmproxy-0.10-jsbeautifier-imports.patch
Date: Thu, 30 Jan 2014 06:37:26
Message-Id: 20140130063722.7E8212004C@flycatcher.gentoo.org
1 radhermit 14/01/30 06:37:22
2
3 Added: mitmproxy-0.10-jsbeautifier-imports.patch
4 Log:
5 Version bump (bug #499734).
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.1 net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch?rev=1.1&content-type=text/plain
14
15 Index: mitmproxy-0.10-jsbeautifier-imports.patch
16 ===================================================================
17 --- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/__init__.py
18 +++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/__init__.py
19 @@ -246,7 +246,7 @@
20 return sweet_code
21
22 def unpack(self, source, evalcode=False):
23 - import jsbeautifier.unpackers as unpackers
24 + from ..jsbeautifier import unpackers
25 try:
26 return unpackers.run(source, evalcode)
27 except unpackers.UnpackingError as error:
28 --- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
29 +++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
30 @@ -7,7 +7,7 @@
31
32 import pkgutil
33 import re
34 -from jsbeautifier.unpackers import evalbased
35 +from ...jsbeautifier.unpackers import evalbased
36
37 # NOTE: AT THE MOMENT, IT IS DEACTIVATED FOR YOUR SECURITY: it runs js!
38 BLACKLIST = ['jsbeautifier.unpackers.evalbased']
39 --- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
40 +++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
41 @@ -40,7 +40,7 @@
42 except ImportError:
43 from urllib.parse import unquote
44
45 -from jsbeautifier.unpackers import UnpackingError
46 +from ...jsbeautifier.unpackers import UnpackingError
47
48 PRIORITY = 1
49
50 --- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/packer.py
51 +++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/packer.py
52 @@ -14,7 +14,7 @@
53
54 import re
55 import string
56 -from jsbeautifier.unpackers import UnpackingError
57 +from ...jsbeautifier.unpackers import UnpackingError
58
59 PRIORITY = 1