aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/script
diff options
context:
space:
mode:
Diffstat (limited to 'libmproxy/script')
-rw-r--r--libmproxy/script/__init__.py2
-rw-r--r--libmproxy/script/concurrent.py1
-rw-r--r--libmproxy/script/reloader.py8
-rw-r--r--libmproxy/script/script.py3
-rw-r--r--libmproxy/script/script_context.py1
5 files changed, 9 insertions, 6 deletions
diff --git a/libmproxy/script/__init__.py b/libmproxy/script/__init__.py
index 8bcdc5a2..3ee19b04 100644
--- a/libmproxy/script/__init__.py
+++ b/libmproxy/script/__init__.py
@@ -10,4 +10,4 @@ __all__ = [
"concurrent",
"ScriptException",
"reloader"
-] \ No newline at end of file
+]
diff --git a/libmproxy/script/concurrent.py b/libmproxy/script/concurrent.py
index bee2d43b..f0f5e3cd 100644
--- a/libmproxy/script/concurrent.py
+++ b/libmproxy/script/concurrent.py
@@ -7,6 +7,7 @@ import threading
class ReplyProxy(object):
+
def __init__(self, original_reply, script_thread):
self.original_reply = original_reply
self.script_thread = script_thread
diff --git a/libmproxy/script/reloader.py b/libmproxy/script/reloader.py
index e81bdef6..b4acf51b 100644
--- a/libmproxy/script/reloader.py
+++ b/libmproxy/script/reloader.py
@@ -1,11 +1,11 @@
import os
import sys
-from watchdog.events import RegexMatchingEventHandler
+from watchdog.events import RegexMatchingEventHandler
if sys.platform == 'darwin':
from watchdog.observers.polling import PollingObserver as Observer
else:
from watchdog.observers import Observer
-# The OSX reloader in watchdog 0.8.3 breaks when unobserving paths.
+# The OSX reloader in watchdog 0.8.3 breaks when unobserving paths.
# We use the PollingObserver instead.
_observers = {}
@@ -31,11 +31,12 @@ def unwatch(script):
class _ScriptModificationHandler(RegexMatchingEventHandler):
+
def __init__(self, callback, filename='.*'):
super(_ScriptModificationHandler, self).__init__(
ignore_directories=True,
- regexes=['.*'+filename]
+ regexes=['.*' + filename]
)
self.callback = callback
@@ -43,4 +44,3 @@ class _ScriptModificationHandler(RegexMatchingEventHandler):
self.callback()
__all__ = ["watch", "unwatch"]
-
diff --git a/libmproxy/script/script.py b/libmproxy/script/script.py
index 498caf94..906f33e5 100644
--- a/libmproxy/script/script.py
+++ b/libmproxy/script/script.py
@@ -12,6 +12,7 @@ from ..exceptions import ScriptException
class Script(object):
+
"""
Script object representing an inline script.
"""
@@ -94,4 +95,4 @@ class Script(object):
except Exception as e:
raise ScriptException(traceback.format_exc(e))
else:
- return None \ No newline at end of file
+ return None
diff --git a/libmproxy/script/script_context.py b/libmproxy/script/script_context.py
index d8748cb2..cd5d4b61 100644
--- a/libmproxy/script/script_context.py
+++ b/libmproxy/script/script_context.py
@@ -6,6 +6,7 @@ from .. import contentviews
class ScriptContext(object):
+
"""
The script context should be used to interact with the global mitmproxy state from within a
script.