Skip to content

Commit 007366d

Browse files
authored
Merge pull request #32 from eklitzke/flake8
minor changes to passff.py to conform to flake8
2 parents a61e0fb + 968efda commit 007366d

File tree

2 files changed

+28
-17
lines changed

2 files changed

+28
-17
lines changed

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
ignore = E266

src/passff.py

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
#!/usr/bin/env python3
2-
32
"""
43
Host application of the browser extension PassFF
54
that wraps around the zx2c4 pass script.
65
"""
76

8-
import os, sys, json, struct, subprocess
7+
import json
8+
import os
9+
import struct
10+
import subprocess
11+
import sys
912

1013
VERSION = "_VERSIONHOLDER_"
1114

12-
################################################################################
13-
######################## Begin preferences section #############################
14-
################################################################################
15-
COMMAND = "pass"
15+
###############################################################################
16+
######################## Begin preferences section ############################
17+
###############################################################################
18+
COMMAND = "pass"
1619
COMMAND_ARGS = []
17-
COMMAND_ENV = {
20+
COMMAND_ENV = {
1821
"TREE_CHARSET": "ISO-8859-1",
1922
"PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
2023
}
21-
CHARSET = "UTF-8"
22-
################################################################################
23-
######################### End preferences section ##############################
24-
################################################################################
24+
CHARSET = "UTF-8"
25+
26+
###############################################################################
27+
######################### End preferences section #############################
28+
###############################################################################
29+
2530

2631
def getMessage():
2732
""" Read a message from stdin and decode it. """
@@ -32,18 +37,21 @@ def getMessage():
3237
message = sys.stdin.buffer.read(messageLength).decode("utf-8")
3338
return json.loads(message)
3439

40+
3541
def encodeMessage(messageContent):
3642
""" Encode a message for transmission, given its content. """
3743
encodedContent = json.dumps(messageContent)
3844
encodedLength = struct.pack('@I', len(encodedContent))
3945
return {'length': encodedLength, 'content': encodedContent}
4046

47+
4148
def sendMessage(encodedMessage):
4249
""" Send an encoded message to stdout. """
4350
sys.stdout.buffer.write(encodedMessage['length'])
4451
sys.stdout.write(encodedMessage['content'])
4552
sys.stdout.flush()
4653

54+
4755
if __name__ == "__main__":
4856
# Read message from standard input
4957
receivedMessage = getMessage()
@@ -94,9 +102,10 @@ def sendMessage(encodedMessage):
94102
proc = subprocess.run(cmd, **proc_params)
95103

96104
# Send response
97-
sendMessage(encodeMessage({
98-
"exitCode": proc.returncode,
99-
"stdout": proc.stdout.decode(CHARSET),
100-
"stderr": proc.stderr.decode(CHARSET),
101-
"version": VERSION
102-
}))
105+
sendMessage(
106+
encodeMessage({
107+
"exitCode": proc.returncode,
108+
"stdout": proc.stdout.decode(CHARSET),
109+
"stderr": proc.stderr.decode(CHARSET),
110+
"version": VERSION
111+
}))

0 commit comments

Comments
 (0)