diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-01-22 17:34:19 +0100 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-02-22 20:20:11 -0700 |
| commit | 708189e54a505ce0baf9a96ff3ad8b6a9942936e (patch) | |
| tree | b3733a9913874550bd7cd14cb17342e3334bf02d /base/server/python/pki/server/__init__.py | |
| parent | 5207fe7a28462f24ba47301a717af15057f3be0e (diff) | |
| download | pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.tar.gz pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.tar.xz pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.zip | |
Renamed pki.nss into pki.nssdb.
The pki.nss module has been renamed into pki.nssdb to prevent
conflicts with the nss module.
https://fedorahosted.org/pki/ticket/456
(cherry picked from commit 9609f4e6035d3cdff19a0f78caee2d08b095c8ba)
Diffstat (limited to 'base/server/python/pki/server/__init__.py')
| -rw-r--r-- | base/server/python/pki/server/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py index 5942115a3..b2fffd5e6 100644 --- a/base/server/python/pki/server/__init__.py +++ b/base/server/python/pki/server/__init__.py @@ -33,7 +33,7 @@ import subprocess import tempfile import pki -import pki.nss +import pki.nssdb INSTANCE_BASE_DIR = '/var/lib/pki' REGISTRY_DIR = '/etc/sysconfig/pki' @@ -305,7 +305,7 @@ class PKIInstance(object): return password def open_nssdb(self, token='internal'): - return pki.nss.NSSDatabase( + return pki.nssdb.NSSDatabase( directory=self.nssdb_dir, token=token, password=self.get_password(token)) |