diff options
| -rw-r--r-- | myrpki/arin-rootcert.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/publication.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/up_down.py | 2 | ||||
| -rw-r--r-- | scripts/x509-dot.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/myrpki/arin-rootcert.py b/myrpki/arin-rootcert.py index 5b1c69e3..fa5a1e50 100644 --- a/myrpki/arin-rootcert.py +++ b/myrpki/arin-rootcert.py @@ -57,5 +57,5 @@ print '''\ ''' for i, prefix in enumerate(prefix for handle, prefix in myrpki.csv_open("prefixes.csv")): - v = 6 if prefix.find(":") >= 0 else 4 + v = 6 if ":" in prefix else 4 print "IPv%d.%d = %s" % (v, i, prefix) diff --git a/rpkid/rpki/publication.py b/rpkid/rpki/publication.py index a899c0ca..38294d59 100644 --- a/rpkid/rpki/publication.py +++ b/rpkid/rpki/publication.py @@ -257,7 +257,7 @@ class publication_object_elt(rpki.xml_utils.base_elt, publication_namespace): for i in xrange(4): u = self.uri.index("/", u + 1) filename = self.gctx.publication_base.rstrip("/") + self.uri[u:] - if filename.find("//") >= 0 or filename.find("/../") >= 0 or filename.endswith("/.."): + if "//" in filename or "/../" in filename or filename.endswith("/.."): raise rpki.exceptions.BadURISyntax, filename return filename diff --git a/rpkid/rpki/up_down.py b/rpkid/rpki/up_down.py index 163bcc6c..dac31fba 100644 --- a/rpkid/rpki/up_down.py +++ b/rpkid/rpki/up_down.py @@ -107,7 +107,7 @@ class multi_uri(list): elif isinstance(ini, str): self[:] = ini.split(",") for s in self: - if s.strip() != s or s.find("://") < 0: + if s.strip() != s or "://" not in s: raise rpki.exceptions.BadURISyntax, "Bad URI \"%s\"" % s else: raise TypeError diff --git a/scripts/x509-dot.py b/scripts/x509-dot.py index 06263e37..a3845c35 100644 --- a/scripts/x509-dot.py +++ b/scripts/x509-dot.py @@ -32,7 +32,7 @@ class x509(object): text = f.read() f.close() - if text.find("-----BEGIN") >= 0: + if "-----BEGIN" in text: self.pow = POW.pemRead(POW.X509_CERTIFICATE, text) else: self.pow = POW.derRead(POW.X509_CERTIFICATE, text) |