diff options
| -rw-r--r-- | rpkid/rpki/left_right.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/publication.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/rpki_engine.py | 10 | ||||
| -rw-r--r-- | rpkid/rpki/sql.py | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/rpkid/rpki/left_right.py b/rpkid/rpki/left_right.py index ef069fc9..c8afa71a 100644 --- a/rpkid/rpki/left_right.py +++ b/rpkid/rpki/left_right.py @@ -34,7 +34,7 @@ class left_right_namespace(object): xmlns = "http://www.hactrn.net/uris/rpki/left-right-spec/" nsmap = { None : xmlns } -class data_elt(rpki.xml_utils.data_elt, rpki.sql.sql_persistant, left_right_namespace): +class data_elt(rpki.xml_utils.data_elt, rpki.sql.sql_persistent, left_right_namespace): """ Virtual class for top-level left-right protocol data elements. """ diff --git a/rpkid/rpki/publication.py b/rpkid/rpki/publication.py index ad4ce866..df22ce58 100644 --- a/rpkid/rpki/publication.py +++ b/rpkid/rpki/publication.py @@ -30,7 +30,7 @@ class publication_namespace(object): xmlns = "http://www.hactrn.net/uris/rpki/publication-spec/" nsmap = { None : xmlns } -class control_elt(rpki.xml_utils.data_elt, rpki.sql.sql_persistant, publication_namespace): +class control_elt(rpki.xml_utils.data_elt, rpki.sql.sql_persistent, publication_namespace): """ Virtual class for control channel objects. """ diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py index 0f78bf31..a876c4a8 100644 --- a/rpkid/rpki/rpki_engine.py +++ b/rpkid/rpki/rpki_engine.py @@ -198,7 +198,7 @@ class rpkid_context(object): return self.https_ta_cache -class ca_obj(rpki.sql.sql_persistant): +class ca_obj(rpki.sql.sql_persistent): """ Internal CA object. """ @@ -423,7 +423,7 @@ class ca_obj(rpki.sql.sql_persistant): rpki.async.iterator(self.fetch_deprecated(), loop, cb) -class ca_detail_obj(rpki.sql.sql_persistant): +class ca_detail_obj(rpki.sql.sql_persistent): """ Internal CA detail object. """ @@ -447,7 +447,7 @@ class ca_detail_obj(rpki.sql.sql_persistant): """ Extra assertions for SQL decode of a ca_detail_obj. """ - rpki.sql.sql_persistant.sql_decode(self, vals) + rpki.sql.sql_persistent.sql_decode(self, vals) assert (self.public_key is None and self.private_key_id is None) or \ self.public_key.get_DER() == self.private_key_id.get_public_DER() assert (self.manifest_public_key is None and self.manifest_private_key_id is None) or \ @@ -794,7 +794,7 @@ class ca_detail_obj(rpki.sql.sql_persistant): repository.publish(self.latest_manifest, self.manifest_uri(ca), callback = callback, errback = errback) -class child_cert_obj(rpki.sql.sql_persistant): +class child_cert_obj(rpki.sql.sql_persistent): """ Certificate that has been issued to a child. """ @@ -948,7 +948,7 @@ class child_cert_obj(rpki.sql.sql_persistant): else: return cls.sql_fetch_where(gctx, where, args) -class revoked_cert_obj(rpki.sql.sql_persistant): +class revoked_cert_obj(rpki.sql.sql_persistent): """ Tombstone for a revoked certificate. """ diff --git a/rpkid/rpki/sql.py b/rpkid/rpki/sql.py index fc8cc809..25c2c21e 100644 --- a/rpkid/rpki/sql.py +++ b/rpkid/rpki/sql.py @@ -120,9 +120,9 @@ class template(object): index_column, index_column) self.delete = "DELETE FROM %s WHERE %s = %%s" % (table_name, index_column) -class sql_persistant(object): +class sql_persistent(object): """ - Mixin for persistant class that needs to be stored in SQL. + Mixin for persistent class that needs to be stored in SQL. """ ## @var sql_in_db |