From 23b855c0a182d5b965fe2d262180525dd50cd59a Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Dec 2010 00:33:24 -0500 Subject: Strip the line properly --- examples/data/scripts/per-site-settings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/per-site-settings.py b/examples/data/scripts/per-site-settings.py index 6503a00..60e5b3a 100755 --- a/examples/data/scripts/per-site-settings.py +++ b/examples/data/scripts/per-site-settings.py @@ -55,8 +55,9 @@ def grep_url(url, path, fin): # 2 == command state = 0 for line in fin: - raw = line.lstrip() - indent = len(line) - len(raw) + raw = line.strip() + + indent = len(line) - len(raw) - 1 if not indent: # Reset state passing = [False, False] -- cgit v1.2.3 From 2092f4ff7a4fa5e3d689ec7f7bc09ba62603ab0e Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Dec 2010 00:34:04 -0500 Subject: Parse the line even if the indent is zero --- examples/data/scripts/per-site-settings.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/per-site-settings.py b/examples/data/scripts/per-site-settings.py index 60e5b3a..26d047e 100755 --- a/examples/data/scripts/per-site-settings.py +++ b/examples/data/scripts/per-site-settings.py @@ -75,15 +75,16 @@ def grep_url(url, path, fin): if cur_indent < indent: state += 1 - # parse the line - if state == 0: - if not passing[0] and match_url(url, raw): - passing[0] = True - elif state == 1 and passing[0]: - if not passing[1] and match_path(path, raw): - passing[1] = True - elif state == 2 and passing[1]: - entries.append(raw) + # parse the line + if state == 0: + if not passing[0] and match_url(url, raw): + passing[0] = True + elif state == 1 and passing[0]: + if not passing[1] and match_path(path, raw): + passing[1] = True + elif state == 2 and passing[1]: + entries.append(raw) + cur_indent = indent return entries -- cgit v1.2.3 From 83478c0589475b1ce1f605c38c1bed9214e9195f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Dec 2010 00:34:32 -0500 Subject: Sockets have a send, not a write, method --- examples/data/scripts/per-site-settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/data/scripts/per-site-settings.py b/examples/data/scripts/per-site-settings.py index 26d047e..1a49ac8 100755 --- a/examples/data/scripts/per-site-settings.py +++ b/examples/data/scripts/per-site-settings.py @@ -94,7 +94,7 @@ def write_to_socket(commands, sockpath): sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock.connect(sockpath) for command in commands: - sock.write(command) + sock.send(command) sock.close() -- cgit v1.2.3 From 6232d7ca7e55b3d1f46af7d2a97240ecca16f399 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Dec 2010 00:34:51 -0500 Subject: Add a missing colon --- examples/data/scripts/per-site-settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/data/scripts/per-site-settings.py b/examples/data/scripts/per-site-settings.py index 1a49ac8..ea80c31 100755 --- a/examples/data/scripts/per-site-settings.py +++ b/examples/data/scripts/per-site-settings.py @@ -108,7 +108,7 @@ if __name__ == '__main__': if mode & stat.S_IEXEC: fin = tempfile.TemporaryFile() subprocess.Popen([filepath], stdout=fin).wait() - else + else: fin = open(filepath, 'r') host, path = (url.hostname, url.path) -- cgit v1.2.3 From 0b554a9233b6c4063fb94cd7eebb9863dbea63b4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Dec 2010 00:35:13 -0500 Subject: No need for temporary variables here --- examples/data/scripts/per-site-settings.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/per-site-settings.py b/examples/data/scripts/per-site-settings.py index ea80c31..3bf8670 100755 --- a/examples/data/scripts/per-site-settings.py +++ b/examples/data/scripts/per-site-settings.py @@ -111,9 +111,7 @@ if __name__ == '__main__': else: fin = open(filepath, 'r') - host, path = (url.hostname, url.path) - - commands = grep_url(host, path, fin) + commands = grep_url(url.hostname, url.path, fin) fin.close() -- cgit v1.2.3 From 81a23f5d5acc4ad7e49508b0cdcaa1fb4dfa0666 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Dec 2010 00:35:36 -0500 Subject: The indentation is set later anyways --- examples/data/scripts/per-site-settings.py | 1 - 1 file changed, 1 deletion(-) (limited to 'examples') diff --git a/examples/data/scripts/per-site-settings.py b/examples/data/scripts/per-site-settings.py index 3bf8670..74bd67c 100755 --- a/examples/data/scripts/per-site-settings.py +++ b/examples/data/scripts/per-site-settings.py @@ -62,7 +62,6 @@ def grep_url(url, path, fin): # Reset state passing = [False, False] state = 0 - cur_indent = 0 else: # previous level if indent < cur_indent: -- cgit v1.2.3 From e5cd5eccb1af0fdedd26d33180a25b1b0f83c258 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Dec 2010 00:36:06 -0500 Subject: Use elif since it's mutually exclusive anyways --- examples/data/scripts/per-site-settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/data/scripts/per-site-settings.py b/examples/data/scripts/per-site-settings.py index 74bd67c..6629d09 100755 --- a/examples/data/scripts/per-site-settings.py +++ b/examples/data/scripts/per-site-settings.py @@ -71,7 +71,7 @@ def grep_url(url, path, fin): passing[1] = False state -= 1 # next level - if cur_indent < indent: + elif cur_indent < indent: state += 1 # parse the line -- cgit v1.2.3