1 |
Signed-off-by: Aaron Bauman <bman@g.o> |
2 |
--- |
3 |
lib/_emerge/actions.py | 14 +++++++------- |
4 |
lib/_emerge/resolver/slot_collision.py | 4 ++-- |
5 |
lib/_emerge/stdout_spinner.py | 2 +- |
6 |
lib/_emerge/unmerge.py | 4 ++-- |
7 |
lib/portage/_sets/dbapi.py | 6 +++--- |
8 |
lib/portage/cache/template.py | 2 +- |
9 |
lib/portage/dep/__init__.py | 10 +++++----- |
10 |
lib/portage/dep/dep_check.py | 2 +- |
11 |
lib/portage/getbinpkg.py | 6 +++--- |
12 |
lib/portage/glsa.py | 2 +- |
13 |
lib/portage/localization.py | 2 +- |
14 |
lib/portage/locks.py | 2 +- |
15 |
lib/portage/manifest.py | 2 +- |
16 |
lib/portage/news.py | 4 ++-- |
17 |
lib/portage/package/ebuild/config.py | 2 +- |
18 |
lib/portage/process.py | 6 +++--- |
19 |
lib/portage/sync/controller.py | 4 ++-- |
20 |
lib/portage/sync/modules/rsync/rsync.py | 8 ++++---- |
21 |
lib/portage/tests/resolver/ResolverPlayground.py | 2 +- |
22 |
lib/portage/util/__init__.py | 4 ++-- |
23 |
lib/portage/util/env_update.py | 2 +- |
24 |
lib/portage/xpak.py | 10 +++++----- |
25 |
pylintrc | 1 + |
26 |
23 files changed, 51 insertions(+), 50 deletions(-) |
27 |
|
28 |
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py |
29 |
index 43e9de43a..7d2d9b315 100644 |
30 |
--- a/lib/_emerge/actions.py |
31 |
+++ b/lib/_emerge/actions.py |
32 |
@@ -333,7 +333,7 @@ def action_build(emerge_config, trees=DeprecationWarning, |
33 |
|
34 |
return 1 |
35 |
else: |
36 |
- if ("--resume" in myopts): |
37 |
+ if "--resume" in myopts: |
38 |
print(darkgreen("emerge: It seems we have nothing to resume...")) |
39 |
return os.EX_OK |
40 |
|
41 |
@@ -450,7 +450,7 @@ def action_build(emerge_config, trees=DeprecationWarning, |
42 |
myopts.pop("--ask", None) |
43 |
|
44 |
if ("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts): |
45 |
- if ("--resume" in myopts): |
46 |
+ if "--resume" in myopts: |
47 |
mymergelist = mydepgraph.altlist() |
48 |
if len(mymergelist) == 0: |
49 |
print(colorize("INFORM", "emerge: It seems we have nothing to resume...")) |
50 |
@@ -522,7 +522,7 @@ def action_build(emerge_config, trees=DeprecationWarning, |
51 |
level=logging.ERROR, noiselevel=-1) |
52 |
return 1 |
53 |
|
54 |
- if ("--resume" in myopts): |
55 |
+ if "--resume" in myopts: |
56 |
favorites=mtimedb["resume"]["favorites"] |
57 |
|
58 |
else: |
59 |
@@ -2319,7 +2319,7 @@ def adjust_config(myopts, settings): |
60 |
settings.backup_changes("PORTAGE_VERBOSE") |
61 |
|
62 |
# Set so that configs will be merged regardless of remembered status |
63 |
- if ("--noconfmem" in myopts): |
64 |
+ if "--noconfmem" in myopts: |
65 |
settings["NOCONFMEM"]="1" |
66 |
settings.backup_changes("NOCONFMEM") |
67 |
|
68 |
@@ -2424,7 +2424,7 @@ def getportageversion(portdir, _unused, profile, chost, vardb): |
69 |
if profilever is None: |
70 |
try: |
71 |
profilever = "!" + os.readlink(profile) |
72 |
- except (OSError): |
73 |
+ except OSError: |
74 |
pass |
75 |
|
76 |
if profilever is None: |
77 |
@@ -3057,7 +3057,7 @@ def run_action(emerge_config): |
78 |
level=logging.ERROR, noiselevel=-1) |
79 |
return 1 |
80 |
|
81 |
- if ("--quiet" in emerge_config.opts): |
82 |
+ if "--quiet" in emerge_config.opts: |
83 |
spinner.update = spinner.update_quiet |
84 |
portage.util.noiselimit = -1 |
85 |
|
86 |
@@ -3085,7 +3085,7 @@ def run_action(emerge_config): |
87 |
if "python-trace" in emerge_config.target_config.settings.features: |
88 |
portage.debug.set_trace(True) |
89 |
|
90 |
- if not ("--quiet" in emerge_config.opts): |
91 |
+ if not "--quiet" in emerge_config.opts: |
92 |
if '--nospinner' in emerge_config.opts or \ |
93 |
emerge_config.target_config.settings.get('TERM') == 'dumb' or \ |
94 |
not sys.stdout.isatty(): |
95 |
diff --git a/lib/_emerge/resolver/slot_collision.py b/lib/_emerge/resolver/slot_collision.py |
96 |
index 7536ce7a2..df3816717 100644 |
97 |
--- a/lib/_emerge/resolver/slot_collision.py |
98 |
+++ b/lib/_emerge/resolver/slot_collision.py |
99 |
@@ -138,8 +138,8 @@ class slot_conflict_handler: |
100 |
config_gen = _configuration_generator(conflict_pkgs) |
101 |
first_config = True |
102 |
|
103 |
- #go through all configurations and collect solutions |
104 |
- while(True): |
105 |
+ # Go through all configurations and collect solutions |
106 |
+ while True: |
107 |
config = config_gen.get_configuration() |
108 |
if not config: |
109 |
break |
110 |
diff --git a/lib/_emerge/stdout_spinner.py b/lib/_emerge/stdout_spinner.py |
111 |
index 26592b7b0..70e132683 100644 |
112 |
--- a/lib/_emerge/stdout_spinner.py |
113 |
+++ b/lib/_emerge/stdout_spinner.py |
114 |
@@ -65,7 +65,7 @@ class stdout_spinner: |
115 |
def update_scroll(self): |
116 |
if self._return_early(): |
117 |
return True |
118 |
- if(self.spinpos >= len(self.scroll_sequence)): |
119 |
+ if self.spinpos >= len(self.scroll_sequence): |
120 |
sys.stdout.write(darkgreen(" \b\b\b" + self.scroll_sequence[ |
121 |
len(self.scroll_sequence) - 1 - (self.spinpos % len(self.scroll_sequence))])) |
122 |
else: |
123 |
diff --git a/lib/_emerge/unmerge.py b/lib/_emerge/unmerge.py |
124 |
index 5204ac6f0..548edaf0c 100644 |
125 |
--- a/lib/_emerge/unmerge.py |
126 |
+++ b/lib/_emerge/unmerge.py |
127 |
@@ -168,7 +168,7 @@ def _unmerge_display(root_config, myopts, unmerge_action, |
128 |
"="+"/".join(sp_absx[sp_vdb_len:])) |
129 |
|
130 |
newline="" |
131 |
- if (not "--quiet" in myopts): |
132 |
+ if not "--quiet" in myopts: |
133 |
newline="\n" |
134 |
if settings["ROOT"] != "/": |
135 |
writemsg_level(darkgreen(newline+ \ |
136 |
@@ -176,7 +176,7 @@ def _unmerge_display(root_config, myopts, unmerge_action, |
137 |
settings["ROOT"])) |
138 |
|
139 |
if (("--pretend" in myopts) or ("--ask" in myopts)) and \ |
140 |
- not ("--quiet" in myopts): |
141 |
+ not "--quiet" in myopts: |
142 |
writemsg_level(darkgreen(newline+\ |
143 |
">>> These are the packages that would be unmerged:\n")) |
144 |
|
145 |
diff --git a/lib/portage/_sets/dbapi.py b/lib/portage/_sets/dbapi.py |
146 |
index 15d1c3786..288e4e75b 100644 |
147 |
--- a/lib/portage/_sets/dbapi.py |
148 |
+++ b/lib/portage/_sets/dbapi.py |
149 |
@@ -418,7 +418,7 @@ class DateSet(EverythingSet): |
150 |
|
151 |
setformat = formats[0] |
152 |
|
153 |
- if (setformat == "package"): |
154 |
+ if setformat == "package": |
155 |
package = options.get("package") |
156 |
try: |
157 |
cpv = vardbapi.match(package)[0] |
158 |
@@ -426,13 +426,13 @@ class DateSet(EverythingSet): |
159 |
date = int(date) |
160 |
except (KeyError, ValueError): |
161 |
raise SetConfigError(_("cannot determine installation date of package %s") % package) |
162 |
- elif (setformat == "filestamp"): |
163 |
+ elif setformat == "filestamp": |
164 |
filestamp = options.get("filestamp") |
165 |
try: |
166 |
date = int(os.stat(filestamp).st_mtime) |
167 |
except (OSError, ValueError): |
168 |
raise SetConfigError(_("cannot determine 'filestamp' of '%s'") % filestamp) |
169 |
- elif (setformat == "seconds"): |
170 |
+ elif setformat == "seconds": |
171 |
try: |
172 |
date = int(options.get("seconds")) |
173 |
except ValueError: |
174 |
diff --git a/lib/portage/cache/template.py b/lib/portage/cache/template.py |
175 |
index c8351a924..31a4acc44 100644 |
176 |
--- a/lib/portage/cache/template.py |
177 |
+++ b/lib/portage/cache/template.py |
178 |
@@ -179,7 +179,7 @@ class database: |
179 |
|
180 |
def sync(self, rate=0): |
181 |
self.sync_rate = rate |
182 |
- if(rate == 0): |
183 |
+ if rate == 0: |
184 |
self.commit() |
185 |
|
186 |
def commit(self): |
187 |
diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py |
188 |
index 50266a21b..7b63446cb 100644 |
189 |
--- a/lib/portage/dep/__init__.py |
190 |
+++ b/lib/portage/dep/__init__.py |
191 |
@@ -1901,7 +1901,7 @@ def dep_getusedeps( depend ): |
192 |
# -1 = failure (think c++ string::npos) |
193 |
comma_separated = False |
194 |
bracket_count = 0 |
195 |
- while( open_bracket != -1 ): |
196 |
+ while open_bracket != -1: |
197 |
bracket_count += 1 |
198 |
if bracket_count > 1: |
199 |
raise InvalidAtom(_("USE Dependency with more " |
200 |
@@ -2610,13 +2610,13 @@ def check_required_use(required_use, use, iuse_match, eapi=None): |
201 |
return True |
202 |
|
203 |
if operator == "||": |
204 |
- return (True in argument) |
205 |
+ return True in argument |
206 |
if operator == "^^": |
207 |
- return (argument.count(True) == 1) |
208 |
+ return argument.count(True) == 1 |
209 |
if operator == "??": |
210 |
- return (argument.count(True) <= 1) |
211 |
+ return argument.count(True) <= 1 |
212 |
if operator[-1] == "?": |
213 |
- return (False not in argument) |
214 |
+ return False not in argument |
215 |
|
216 |
mysplit = required_use.split() |
217 |
level = 0 |
218 |
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py |
219 |
index b6491a430..60c8ec6d0 100644 |
220 |
--- a/lib/portage/dep/dep_check.py |
221 |
+++ b/lib/portage/dep/dep_check.py |
222 |
@@ -736,7 +736,7 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None, |
223 |
if choice.all_available or allow_masked: |
224 |
return choice.atoms |
225 |
|
226 |
- assert(False) # This point should not be reachable |
227 |
+ assert False # This point should not be reachable |
228 |
|
229 |
def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, |
230 |
use_cache=1, use_binaries=0, myroot=None, trees=None): |
231 |
diff --git a/lib/portage/getbinpkg.py b/lib/portage/getbinpkg.py |
232 |
index d588b324b..0384986d1 100644 |
233 |
--- a/lib/portage/getbinpkg.py |
234 |
+++ b/lib/portage/getbinpkg.py |
235 |
@@ -180,7 +180,7 @@ def create_conn(baseurl, conn=None): |
236 |
conn = http_client_HTTPConnection(host) |
237 |
elif protocol == "ftp": |
238 |
passive = 1 |
239 |
- if(host[-1] == "*"): |
240 |
+ if host[-1] == "*": |
241 |
passive = 0 |
242 |
host = host[:-1] |
243 |
conn = ftplib.FTP(host) |
244 |
@@ -287,10 +287,10 @@ def make_http_request(conn, address, _params={}, headers={}, dest=None): |
245 |
for x in str(response.msg).split("\n"): |
246 |
parts = x.split(": ", 1) |
247 |
if parts[0] == "Location": |
248 |
- if (rc == 301): |
249 |
+ if rc == 301: |
250 |
sys.stderr.write(colorize("BAD", |
251 |
_("Location has moved: ")) + str(parts[1]) + "\n") |
252 |
- if (rc == 302): |
253 |
+ if rc == 302: |
254 |
sys.stderr.write(colorize("BAD", |
255 |
_("Location has temporarily moved: ")) + \ |
256 |
str(parts[1]) + "\n") |
257 |
diff --git a/lib/portage/glsa.py b/lib/portage/glsa.py |
258 |
index 12b33f45d..27957180b 100644 |
259 |
--- a/lib/portage/glsa.py |
260 |
+++ b/lib/portage/glsa.py |
261 |
@@ -666,7 +666,7 @@ class Glsa: |
262 |
if not os.access(os.path.join(self.config["EROOT"], |
263 |
PRIVATE_PATH, "glsa_injected"), os.R_OK): |
264 |
return False |
265 |
- return (self.nr in get_applied_glsas(self.config)) |
266 |
+ return self.nr in get_applied_glsas(self.config) |
267 |
|
268 |
def inject(self): |
269 |
""" |
270 |
diff --git a/lib/portage/localization.py b/lib/portage/localization.py |
271 |
index b215b9cba..de54295a2 100644 |
272 |
--- a/lib/portage/localization.py |
273 |
+++ b/lib/portage/localization.py |
274 |
@@ -43,4 +43,4 @@ def localized_size(num_bytes): |
275 |
except UnicodeDecodeError: |
276 |
# failure to decode locale data |
277 |
formatted_num = str(num_kib) |
278 |
- return (_unicode_decode(formatted_num, encoding=_encodings['stdio']) + ' KiB') |
279 |
+ return _unicode_decode(formatted_num, encoding=_encodings['stdio']) + ' KiB' |
280 |
diff --git a/lib/portage/locks.py b/lib/portage/locks.py |
281 |
index 5fa6d5d38..701093024 100644 |
282 |
--- a/lib/portage/locks.py |
283 |
+++ b/lib/portage/locks.py |
284 |
@@ -441,7 +441,7 @@ def unlockfile(mytuple): |
285 |
else: |
286 |
raise InvalidData |
287 |
|
288 |
- if(myfd == HARDLINK_FD): |
289 |
+ if myfd == HARDLINK_FD: |
290 |
unhardlink_lockfile(lockfilename, unlinkfile=unlinkfile) |
291 |
return True |
292 |
|
293 |
diff --git a/lib/portage/manifest.py b/lib/portage/manifest.py |
294 |
index d43f7d836..51a93b35e 100644 |
295 |
--- a/lib/portage/manifest.py |
296 |
+++ b/lib/portage/manifest.py |
297 |
@@ -421,7 +421,7 @@ class Manifest: |
298 |
|
299 |
def hasFile(self, ftype, fname): |
300 |
""" Return whether the Manifest contains an entry for the given type,filename pair """ |
301 |
- return (fname in self.fhashdict[ftype]) |
302 |
+ return fname in self.fhashdict[ftype] |
303 |
|
304 |
def findFile(self, fname): |
305 |
""" Return entrytype of the given file if present in Manifest or None if not present """ |
306 |
diff --git a/lib/portage/news.py b/lib/portage/news.py |
307 |
index 21a7c6a1f..3d6b04e1e 100644 |
308 |
--- a/lib/portage/news.py |
309 |
+++ b/lib/portage/news.py |
310 |
@@ -346,8 +346,8 @@ class DisplayProfileRestriction(DisplayRestriction): |
311 |
|
312 |
def checkRestriction(self, **kwargs): |
313 |
if fnmatch.fnmatch(self.format, '2.*') and self.profile.endswith('/*'): |
314 |
- return (kwargs['profile'].startswith(self.profile[:-1])) |
315 |
- return (kwargs['profile'] == self.profile) |
316 |
+ return kwargs['profile'].startswith(self.profile[:-1]) |
317 |
+ return kwargs['profile'] == self.profile |
318 |
|
319 |
class DisplayKeywordRestriction(DisplayRestriction): |
320 |
""" |
321 |
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py |
322 |
index 74b998d0b..b62ad3069 100644 |
323 |
--- a/lib/portage/package/ebuild/config.py |
324 |
+++ b/lib/portage/package/ebuild/config.py |
325 |
@@ -2344,7 +2344,7 @@ class config: |
326 |
if not x: |
327 |
continue |
328 |
|
329 |
- if (x[0]=="-"): |
330 |
+ if x[0] == "-": |
331 |
myflags.discard(x[1:]) |
332 |
continue |
333 |
|
334 |
diff --git a/lib/portage/process.py b/lib/portage/process.py |
335 |
index 1ff886bf3..8d4cf164e 100644 |
336 |
--- a/lib/portage/process.py |
337 |
+++ b/lib/portage/process.py |
338 |
@@ -433,11 +433,11 @@ def spawn(mycommand, env=None, opt_name=None, fd_pipes=None, returnpid=False, |
339 |
os.waitpid(pid, 0) |
340 |
|
341 |
# If it got a signal, return the signal that was sent. |
342 |
- if (retval & 0xff): |
343 |
- return ((retval & 0xff) << 8) |
344 |
+ if retval & 0xff: |
345 |
+ return (retval & 0xff) << 8 |
346 |
|
347 |
# Otherwise, return its exit code. |
348 |
- return (retval >> 8) |
349 |
+ return retval >> 8 |
350 |
|
351 |
# Everything succeeded |
352 |
return 0 |
353 |
diff --git a/lib/portage/sync/controller.py b/lib/portage/sync/controller.py |
354 |
index 6b47ae953..93cf7bfb4 100644 |
355 |
--- a/lib/portage/sync/controller.py |
356 |
+++ b/lib/portage/sync/controller.py |
357 |
@@ -44,8 +44,8 @@ class TaskHandler: |
358 |
def run_tasks(self, tasks, func, status=None, verbose=True, options=None): |
359 |
"""Runs the module tasks""" |
360 |
# Ensure we have a task and function |
361 |
- assert(tasks) |
362 |
- assert(func) |
363 |
+ assert tasks |
364 |
+ assert func |
365 |
for task in tasks: |
366 |
inst = task() |
367 |
show_progress = self.show_progress_bar and self.isatty |
368 |
diff --git a/lib/portage/sync/modules/rsync/rsync.py b/lib/portage/sync/modules/rsync/rsync.py |
369 |
index 4ccf7769f..cf574208d 100644 |
370 |
--- a/lib/portage/sync/modules/rsync/rsync.py |
371 |
+++ b/lib/portage/sync/modules/rsync/rsync.py |
372 |
@@ -293,7 +293,7 @@ class RsyncSync(NewBase): |
373 |
effective_maxretries = len(uris) - 1 |
374 |
|
375 |
local_state_unchanged = True |
376 |
- while (1): |
377 |
+ while 1: |
378 |
if uris: |
379 |
dosyncuri = uris.pop() |
380 |
elif maxretries < 0 or retries > maxretries: |
381 |
@@ -304,7 +304,7 @@ class RsyncSync(NewBase): |
382 |
uris.extend(uris_orig) |
383 |
dosyncuri = uris.pop() |
384 |
|
385 |
- if (retries==0): |
386 |
+ if retries == 0: |
387 |
if "--ask" in opts: |
388 |
uq = UserQuery(opts) |
389 |
if uq.query("Do you want to sync your ebuild repository " + \ |
390 |
@@ -422,7 +422,7 @@ class RsyncSync(NewBase): |
391 |
openpgp_env.close() |
392 |
|
393 |
def _process_exitcode(self, exitcode, syncuri, out, maxretries): |
394 |
- if (exitcode==0): |
395 |
+ if exitcode == 0: |
396 |
pass |
397 |
elif exitcode == SERVER_OUT_OF_DATE: |
398 |
exitcode = 1 |
399 |
@@ -430,7 +430,7 @@ class RsyncSync(NewBase): |
400 |
sys.stderr.write( |
401 |
">>> Exceeded PORTAGE_RSYNC_RETRIES: %s\n" % maxretries) |
402 |
exitcode = 1 |
403 |
- elif (exitcode>0): |
404 |
+ elif exitcode > 0: |
405 |
msg = [] |
406 |
if exitcode==1: |
407 |
msg.append("Rsync has reported that there is a syntax error. Please ensure") |
408 |
diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py |
409 |
index 1e382002a..89feea47a 100644 |
410 |
--- a/lib/portage/tests/resolver/ResolverPlayground.py |
411 |
+++ b/lib/portage/tests/resolver/ResolverPlayground.py |
412 |
@@ -756,7 +756,7 @@ class ResolverPlaygroundTestCase: |
413 |
|
414 |
if match and self.merge_order_assertions: |
415 |
for node1, node2 in self.merge_order_assertions: |
416 |
- if not (got.index(node1) < got.index(node2)): |
417 |
+ if not got.index(node1) < got.index(node2): |
418 |
fail_msgs.append("atoms: (" + \ |
419 |
", ".join(result.atoms) + "), key: " + \ |
420 |
("merge_order_assertions, expected: %s" % \ |
421 |
diff --git a/lib/portage/util/__init__.py b/lib/portage/util/__init__.py |
422 |
index 84f1391f6..c14c15fe8 100644 |
423 |
--- a/lib/portage/util/__init__.py |
424 |
+++ b/lib/portage/util/__init__.py |
425 |
@@ -787,7 +787,7 @@ def varexpand(mystring, mydict=None, error_leader=None): |
426 |
while pos < length: |
427 |
current = mystring[pos] |
428 |
if current == "'": |
429 |
- if (indoub): |
430 |
+ if indoub: |
431 |
newstring.append("'") |
432 |
else: |
433 |
newstring.append("'") # Quote removal is handled by shlex. |
434 |
@@ -795,7 +795,7 @@ def varexpand(mystring, mydict=None, error_leader=None): |
435 |
pos += 1 |
436 |
continue |
437 |
elif current == '"': |
438 |
- if (insing): |
439 |
+ if insing: |
440 |
newstring.append('"') |
441 |
else: |
442 |
newstring.append('"') # Quote removal is handled by shlex. |
443 |
diff --git a/lib/portage/util/env_update.py b/lib/portage/util/env_update.py |
444 |
index 7a2ee2551..f130b6f6b 100644 |
445 |
--- a/lib/portage/util/env_update.py |
446 |
+++ b/lib/portage/util/env_update.py |
447 |
@@ -182,7 +182,7 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, |
448 |
oldld = None |
449 |
|
450 |
newld = specials["LDPATH"] |
451 |
- if (oldld != newld): |
452 |
+ if oldld != newld: |
453 |
#ld.so.conf needs updating and ldconfig needs to be run |
454 |
myfd = atomic_ofstream(ldsoconf_path) |
455 |
myfd.write("# ld.so.conf autogenerated by env-update; make all changes to\n") |
456 |
diff --git a/lib/portage/xpak.py b/lib/portage/xpak.py |
457 |
index 746ef6f5a..2a4bcda21 100644 |
458 |
--- a/lib/portage/xpak.py |
459 |
+++ b/lib/portage/xpak.py |
460 |
@@ -213,7 +213,7 @@ def getindex_mem(myindex): |
461 |
myindexlen = len(myindex) |
462 |
startpos = 0 |
463 |
myret = [] |
464 |
- while ((startpos + 8) < myindexlen): |
465 |
+ while (startpos + 8) < myindexlen: |
466 |
mytestlen = decodeint(myindex[startpos:startpos + 4]) |
467 |
myret = myret + [myindex[startpos + 4:startpos + 4 + mytestlen]] |
468 |
startpos = startpos + mytestlen + 12 |
469 |
@@ -227,7 +227,7 @@ def searchindex(myindex, myitem): |
470 |
mylen = len(myitem) |
471 |
myindexlen = len(myindex) |
472 |
startpos = 0 |
473 |
- while ((startpos + 8) < myindexlen): |
474 |
+ while (startpos + 8) < myindexlen: |
475 |
mytestlen = decodeint(myindex[startpos:startpos + 4]) |
476 |
if mytestlen == mylen: |
477 |
if myitem == myindex[startpos + 4:startpos + 4 + mytestlen]: |
478 |
@@ -251,7 +251,7 @@ def xpand(myid, mydest): |
479 |
mydata = myid[1] |
480 |
myindexlen = len(myindex) |
481 |
startpos = 0 |
482 |
- while ((startpos + 8) < myindexlen): |
483 |
+ while (startpos + 8) < myindexlen: |
484 |
namelen = decodeint(myindex[startpos:startpos + 4]) |
485 |
datapos = decodeint(myindex[startpos + 4 + namelen:startpos + 8 + namelen]) |
486 |
datalen = decodeint(myindex[startpos + 8 + namelen:startpos + 12 + namelen]) |
487 |
@@ -439,7 +439,7 @@ class tbz2: |
488 |
if not os.path.exists(mydest): |
489 |
os.makedirs(mydest) |
490 |
startpos = 0 |
491 |
- while ((startpos + 8) < self.indexsize): |
492 |
+ while (startpos + 8) < self.indexsize: |
493 |
namelen = decodeint(self.index[startpos:startpos + 4]) |
494 |
datapos = decodeint(self.index[startpos + 4 + namelen:startpos + 8 + namelen]) |
495 |
datalen = decodeint(self.index[startpos + 8 + namelen:startpos + 12 + namelen]) |
496 |
@@ -472,7 +472,7 @@ class tbz2: |
497 |
encoding=_encodings['fs'], errors='strict'), 'rb') |
498 |
mydata = {} |
499 |
startpos = 0 |
500 |
- while ((startpos + 8) < self.indexsize): |
501 |
+ while (startpos + 8) < self.indexsize: |
502 |
namelen = decodeint(self.index[startpos:startpos + 4]) |
503 |
datapos = decodeint(self.index[startpos + 4 + namelen:startpos + 8 + namelen]) |
504 |
datalen = decodeint(self.index[startpos + 8 + namelen:startpos + 12 + namelen]) |
505 |
diff --git a/pylintrc b/pylintrc |
506 |
index b7091516c..b7efcb43e 100644 |
507 |
--- a/pylintrc |
508 |
+++ b/pylintrc |
509 |
@@ -22,6 +22,7 @@ enable= |
510 |
redefined-builtin, |
511 |
reimported, |
512 |
relative-beyond-top-level, |
513 |
+ superfluous-parens, |
514 |
trailing-comma-tuple, |
515 |
trailing-newlines, |
516 |
trailing-whitespace, |
517 |
-- |
518 |
2.28.0 |