Skip to content

Commit a2718d3

Browse files
committed
flake8 - remove unused imports, unused vars, whitespace fixes
1 parent bb209b1 commit a2718d3

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

roundup/cgi/client.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,30 @@
88
import codecs
99
import email.utils
1010
import errno
11-
import hashlib
1211
import logging
1312
import mimetypes
1413
import os
15-
import quopri
1614
import re
1715
import socket
1816
import stat
1917
import sys
2018
import time
2119

22-
from email.mime.base import MIMEBase
2320
from email.mime.multipart import MIMEMultipart
24-
from email.mime.text import MIMEText
2521
from traceback import format_exc
2622
try:
2723
from OpenSSL.SSL import SysCallError
2824
except ImportError:
2925
class SysCallError(Exception):
3026
pass
3127

32-
import roundup.anypy.email_
28+
import roundup.anypy.email_ # noqa: F401 -- patches for email library code
3329
import roundup.anypy.random_ as random_ # quality of random checked below
3430

35-
from roundup import date, hyperdb, password, rest, roundupdb, xmlrpc
31+
from roundup import hyperdb, rest, xmlrpc
3632

3733
from roundup.anypy import http_, urllib_, xmlrpc_
38-
from roundup.anypy.cookie_ import BaseCookie, CookieError, get_cookie_date, \
34+
from roundup.anypy.cookie_ import BaseCookie, CookieError, get_cookie_date, \
3935
SimpleCookie
4036
from roundup.anypy.html import html_escape
4137
from roundup.anypy.strings import s2b, b2s, bs2b, uchr, is_us
@@ -76,7 +72,8 @@ def initialiseSecurity(security):
7672
description="User may access the rest interface")
7773
security.addPermissionToRole('Admin', p)
7874

79-
p = security.addPermission(name="Xmlrpc Access",
75+
p = security.addPermission(
76+
name="Xmlrpc Access",
8077
description="User may access the xmlrpc interface")
8178
security.addPermissionToRole('Admin', p)
8279

@@ -600,7 +597,7 @@ def handle_xmlrpc(self):
600597
# It will return True if everything is ok,
601598
# raises exception on check failure.
602599
csrf_ok = self.handle_csrf(api=True)
603-
except (Unauthorised, UsageError) as msg:
600+
except (Unauthorised, UsageError):
604601
# report exception back to server
605602
exc_type, exc_value, exc_tb = sys.exc_info()
606603
output = xmlrpc_.client.dumps(
@@ -639,7 +636,8 @@ def handle_rest(self):
639636
return
640637

641638
# allow preflight request even if unauthenticated
642-
if (self.env['REQUEST_METHOD'] == "OPTIONS"
639+
if (
640+
self.env['REQUEST_METHOD'] == "OPTIONS"
643641
and self.request.headers.get("Access-Control-Request-Headers")
644642
and self.request.headers.get("Access-Control-Request-Method")
645643
and self.request.headers.get("Origin")
@@ -681,7 +679,7 @@ def handle_rest(self):
681679
except (Unauthorised, UsageError) as msg:
682680
# FIXME should return what the client requests
683681
# via accept header.
684-
output = s2b('{ "error": { "status": 400, "msg": "%s"}}' %
682+
output = s2b('{ "error": { "status": 400, "msg": "%s"}}' %
685683
str(msg))
686684
self.response_code = 400
687685
self.setHeader("Content-Length", str(len(output)))
@@ -885,7 +883,8 @@ def inner_main(self):
885883
self.response_code = 404
886884
self.template = '404'
887885
try:
888-
cl = self.db.getclass(self.classname)
886+
# generates keyerror if class does not exist
887+
self.db.getclass(self.classname)
889888
self.write_html(self.renderContext())
890889
except KeyError:
891890
# we can't map the URL to a class we know about
@@ -913,7 +912,7 @@ def inner_main(self):
913912
else:
914913
# in debug mode, only write error to screen.
915914
self.write_html(e.html)
916-
except Exception as e:
915+
except Exception as e: # noqa: F841
917916
# Something has gone badly wrong. Therefore, we should
918917
# make sure that the response code indicates failure.
919918
if self.response_code == http_.client.OK:
@@ -984,7 +983,7 @@ def determine_charset(self):
984983
codecs.lookup(charset)
985984
except LookupError:
986985
self.add_error_message(self._('Unrecognized charset: %r') %
987-
charset)
986+
charset)
988987

989988
charset_parameter = 0
990989
else:
@@ -1150,7 +1149,7 @@ def determine_user(self):
11501149
self.make_user_anonymous()
11511150
login = self.get_action_class('login')(self)
11521151
login.verifyLogin(username, password)
1153-
except LoginError as err:
1152+
except LoginError:
11541153
self.make_user_anonymous()
11551154
raise
11561155
user = username
@@ -2205,12 +2204,12 @@ def get_action_class(self, action_name):
22052204
# tracker-defined action
22062205
action_klass = self.instance.cgi_actions[action_name]
22072206
else:
2208-
# go with a default
2209-
for name, action_klass in self.actions:
2207+
# go with a default, action_klass used after end of loop
2208+
for name, action_klass in self.actions: # noqa: B007
22102209
if name == action_name:
22112210
break
22122211
else:
2213-
raise ValueError('No such action "%s"' %
2212+
raise ValueError('No such action "%s"' %
22142213
html_escape(action_name))
22152214
return action_klass
22162215

0 commit comments

Comments
 (0)