@@ -51,16 +51,13 @@ def get_tracker(self, name):
5151 return self .TRACKERS [name ]
5252
5353 if name not in self .TRACKER_HOMES :
54- raise Exception ('No such tracker "%s"' % name )
54+ raise Exception ('No such tracker "%s"' % name )
5555 tracker_home = self .TRACKER_HOMES [name ]
5656 tracker = roundup .instance .open (tracker_home )
5757 self .TRACKERS [name ] = tracker
5858 return tracker
5959
60-
6160 def authenticate (self , tracker ):
62-
63-
6461 # Try to extract username and password from HTTP Authentication.
6562 username , password = None , None
6663 authorization = self .headers .get ('authorization' , ' ' )
@@ -77,7 +74,7 @@ def authenticate(self, tracker):
7774 db = tracker .open ('admin' )
7875 try :
7976 userid = db .user .lookup (username )
80- except KeyError : # No such user
77+ except KeyError : # No such user
8178 db .close ()
8279 raise Unauthorised ('Invalid user' )
8380 stored = db .user .get (userid , 'password' )
@@ -88,7 +85,6 @@ def authenticate(self, tracker):
8885 db .setCurrentUser (username )
8986 return db
9087
91-
9288 def do_POST (self ):
9389 """Extract username and password from authorization header."""
9490
@@ -103,7 +99,7 @@ def do_POST(self):
10399 self .server .register_instance (instance )
104100 SimpleXMLRPCRequestHandler .do_POST (self )
105101 except Unauthorised as message :
106- self .send_error (403 , '%s (%s)' % (self .path , message ))
102+ self .send_error (403 , '%s (%s)' % (self .path , message ))
107103 except :
108104 if db :
109105 db .close ()
@@ -131,14 +127,15 @@ def usage():
131127 -V -- be verbose when importing
132128 -p, --port <port> -- port to listen on
133129
134- """ % sys .argv [0 ])
130+ """ % sys .argv [0 ])
131+
135132
136133def run ():
137134
138135 try :
139136 opts , args = getopt .getopt (sys .argv [1 :],
140137 'e:i:p:V' , ['encoding=' , 'port=' ])
141- except getopt .GetoptError as e :
138+ except getopt .GetoptError :
142139 usage ()
143140 return 1
144141
@@ -169,9 +166,9 @@ def run():
169166
170167 tracker_homes [name ] = home
171168
172- RequestHandler .TRACKER_HOMES = tracker_homes
169+ RequestHandler .TRACKER_HOMES = tracker_homes
173170
174- if sys .version_info [0 :2 ] < (2 ,5 ):
171+ if sys .version_info [0 :2 ] < (2 , 5 ):
175172 if encoding :
176173 print ('encodings not supported with python < 2.5' )
177174 sys .exit (- 1 )
@@ -188,5 +185,6 @@ def run():
188185 except KeyboardInterrupt :
189186 print ('Keyboard Interrupt: exiting' )
190187
188+
191189if __name__ == '__main__' :
192190 run ()
0 commit comments