diff options
| -rw-r--r-- | Lib/_markupbase.py | 8 | ||||
| -rw-r--r-- | Lib/ftplib.py | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Lib/_markupbase.py b/Lib/_markupbase.py index adf6ba2..98b9037 100644 --- a/Lib/_markupbase.py +++ b/Lib/_markupbase.py @@ -122,7 +122,7 @@ class ParserBase: # this could be handled in a separate doctype parser if decltype == "doctype": j = self._parse_doctype_subset(j + 1, i) - elif decltype in ("attlist", "linktype", "link", "element"): + elif decltype in {"attlist", "linktype", "link", "element"}: # must tolerate []'d groups in a content model in an element declaration # also in data attribute specifications of attlist declaration # also link type declaration subsets in linktype declarations @@ -145,10 +145,10 @@ class ParserBase: sectName, j = self._scan_name( i+3, i ) if j < 0: return j - if sectName in ("temp", "cdata", "ignore", "include", "rcdata"): + if sectName in {"temp", "cdata", "ignore", "include", "rcdata"}: # look for standard ]]> ending match= _markedsectionclose.search(rawdata, i+3) - elif sectName in ("if", "else", "endif"): + elif sectName in {"if", "else", "endif"}: # look for MS Office ]> ending match= _msmarkedsectionclose.search(rawdata, i+3) else: @@ -203,7 +203,7 @@ class ParserBase: name, j = self._scan_name(j + 2, declstartpos) if j == -1: return -1 - if name not in ("attlist", "element", "entity", "notation"): + if name not in {"attlist", "element", "entity", "notation"}: self.updatepos(declstartpos, j + 2) self.error( "unknown declaration %r in internal subset" % name) diff --git a/Lib/ftplib.py b/Lib/ftplib.py index ef69ca6..9c190ba 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -171,7 +171,7 @@ class FTP: def sanitize(self, s): if s[:5] == 'pass ' or s[:5] == 'PASS ': i = len(s) - while i > 5 and s[i-1] in '\r\n': + while i > 5 and s[i-1] in {'\r', '\n'}: i = i-1 s = s[:5] + '*'*(i-5) + s[i:] return repr(s) @@ -221,7 +221,7 @@ class FTP: if self.debugging: print('*resp*', self.sanitize(resp)) self.lastresp = resp[:3] c = resp[:1] - if c in ('1', '2', '3'): + if c in {'1', '2', '3'}: return resp if c == '4': raise error_temp(resp) @@ -245,7 +245,7 @@ class FTP: if self.debugging > 1: print('*put urgent*', self.sanitize(line)) self.sock.sendall(line, MSG_OOB) resp = self.getmultiline() - if resp[:3] not in ('426', '225', '226'): + if resp[:3] not in {'426', '225', '226'}: raise error_proto(resp) def sendcmd(self, cmd): @@ -375,7 +375,7 @@ class FTP: if not user: user = 'anonymous' if not passwd: passwd = '' if not acct: acct = '' - if user == 'anonymous' and passwd in ('', '-'): + if user == 'anonymous' and passwd in {'', '-'}: # If there is no anonymous ftp password specified # then we'll just use anonymous@ # We don't send any other thing because: @@ -534,7 +534,7 @@ class FTP: def delete(self, filename): '''Delete a file.''' resp = self.sendcmd('DELE ' + filename) - if resp[:3] in ('250', '200'): + if resp[:3] in {'250', '200'}: return resp else: raise error_reply(resp) @@ -897,9 +897,9 @@ def ftpcp(source, sourcename, target, targetname = '', type = 'I'): # transfer request. # So: STOR before RETR, because here the target is a "user". treply = target.sendcmd('STOR ' + targetname) - if treply[:3] not in ('125', '150'): raise error_proto # RFC 959 + if treply[:3] not in {'125', '150'}: raise error_proto # RFC 959 sreply = source.sendcmd('RETR ' + sourcename) - if sreply[:3] not in ('125', '150'): raise error_proto # RFC 959 + if sreply[:3] not in {'125', '150'}: raise error_proto # RFC 959 source.voidresp() target.voidresp() |