Skip to content

Commit 64bed2b

Browse files
committed
Fix flake8
It seems like the flake8 container/rules have changed, mostly indentation.
1 parent 5e9075c commit 64bed2b

5 files changed

Lines changed: 30 additions & 28 deletions

File tree

.flake8

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

sd-journalist/sd-process-display

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import sys
22
import PyQt4.QtCore as QtCore
33
from PyQt4.QtGui import QDialog, QDialogButtonBox, QApplication, \
4-
QLabel, QVBoxLayout, QImage, QPixmap
4+
QLabel, QVBoxLayout, QImage, QPixmap
55
from PyQt4.QtCore import Qt
66
import os
77
import threading

sd-svs/decrypt-sd-submission

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ try:
3737
# given a malicious tarball
3838
tar.extractall(tmpdir)
3939

40-
except Exception as e:
40+
except Exception:
4141
send_progress("DECRYPTION_BUNDLE_OPEN_FAILURE")
4242
# although we're exiting with failure, we return a
4343
# 0 exit code so xdg does not try to re-open this file with
@@ -139,7 +139,7 @@ try:
139139
print(os.path.join(tmpdir, "extracted"))
140140
distutils.dir_util.copy_tree(os.path.join(tmpdir, "extracted"),
141141
"/home/user/Sources/", update=1)
142-
except Exception as e:
142+
except Exception:
143143
send_progress("DECRYPTED_BUNDLE_COPY_FAILURE")
144144
shutil.rmtree(tmpdir)
145145
sys.exit(0)

tests/integration/test_integration

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -142,35 +142,35 @@ def run_q(n):
142142

143143
if run_q("full-success"):
144144
receiver.expected_states = [
145-
"DECRYPTION_PROCESS_START",
146-
"SUBMISSION_BUNDLE_UNBUNDLED",
147-
"SUBMISSION_FILES_EXTRACTED",
148-
"SUBMISSION_FILE_DECRYPTION_SUCCEEDED",
149-
"SUBMISSION_FILE_DECRYPTION_SUCCEEDED",
150-
"DECRYPTED_BUNDLE_ON_SVS",
151-
"DECRYPTED_FILES_AVAILABLE",
145+
"DECRYPTION_PROCESS_START",
146+
"SUBMISSION_BUNDLE_UNBUNDLED",
147+
"SUBMISSION_FILES_EXTRACTED",
148+
"SUBMISSION_FILE_DECRYPTION_SUCCEEDED",
149+
"SUBMISSION_FILE_DECRYPTION_SUCCEEDED",
150+
"DECRYPTED_BUNDLE_ON_SVS",
151+
"DECRYPTED_FILES_AVAILABLE",
152152
]
153153
receiver.cmd = ["qvm-open-in-vm", "sd-svs", "./all.sd-xfer"]
154154
receiver.test_name = "full successful open"
155155
receiver.test()
156156

157157
if run_q("empty-download"):
158158
receiver.expected_states = [
159-
"DECRYPTION_PROCESS_START",
160-
"DECRYPTION_BUNDLE_OPEN_FAILURE",
159+
"DECRYPTION_PROCESS_START",
160+
"DECRYPTION_BUNDLE_OPEN_FAILURE",
161161
]
162162
receiver.cmd = ["qvm-open-in-vm", "sd-svs", "./empty.sd-xfer"]
163163
receiver.test_name = "empty sd-xfer"
164164
receiver.test()
165165

166166
if run_q("bad-gpg-key"):
167167
receiver.expected_states = [
168-
"DECRYPTION_PROCESS_START",
169-
"SUBMISSION_BUNDLE_UNBUNDLED",
170-
"SUBMISSION_FILES_EXTRACTED",
171-
"SUBMISSION_FILE_DECRYPTION_FAILED",
172-
"SUBMISSION_FILE_DECRYPTION_FAILED",
173-
"SUBMISSION_FILE_NO_FILES_FOUND",
168+
"DECRYPTION_PROCESS_START",
169+
"SUBMISSION_BUNDLE_UNBUNDLED",
170+
"SUBMISSION_FILES_EXTRACTED",
171+
"SUBMISSION_FILE_DECRYPTION_FAILED",
172+
"SUBMISSION_FILE_DECRYPTION_FAILED",
173+
"SUBMISSION_FILE_NO_FILES_FOUND",
174174
]
175175
receiver.cmd = ["qvm-open-in-vm", "sd-svs", "./bad-key.sd-xfer"]
176176
receiver.test_name = "bad encryption key"

tests/test_svs.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@ def setUp(self):
1010

1111
def test_decrypt_sd_submission(self):
1212
self.assertFilesMatch(
13-
"/usr/bin/decrypt-sd-submission",
14-
"sd-svs/decrypt-sd-submission")
13+
"/usr/bin/decrypt-sd-submission",
14+
"sd-svs/decrypt-sd-submission")
1515

1616
def test_decrypt_sd_submission_desktop(self):
1717
self.assertFilesMatch(
18-
"/usr/share/applications/decrypt-sd-submission.desktop",
19-
"sd-svs/decrypt-sd-submission.desktop")
18+
"/usr/share/applications/decrypt-sd-submission.desktop",
19+
"sd-svs/decrypt-sd-submission.desktop")
2020

2121
def test_decrypt_sd_user_profile(self):
2222
self.assertFilesMatch(
23-
"/etc/profile.d/sd-svs-qubes-gpg-domain.sh",
24-
"sd-svs/dot-profile")
23+
"/etc/profile.d/sd-svs-qubes-gpg-domain.sh",
24+
"sd-svs/dot-profile")
2525

2626
def test_open_in_dvm_desktop(self):
2727
self.assertFilesMatch(
28-
"/usr/share/applications/open-in-dvm.desktop",
29-
"sd-svs/open-in-dvm.desktop")
28+
"/usr/share/applications/open-in-dvm.desktop",
29+
"sd-svs/open-in-dvm.desktop")
3030

3131
def test_mimeapps(self):
3232
self.assertFilesMatch(
33-
"/usr/share/applications/mimeapps.list",
34-
"sd-svs/mimeapps.list")
33+
"/usr/share/applications/mimeapps.list",
34+
"sd-svs/mimeapps.list")
3535

3636

3737
def load_tests(loader, tests, pattern):

0 commit comments

Comments
 (0)