diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-02 23:40:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-02 23:40:58 +0000 |
| commit | 03adfdbc1c08fc9a7eccd9741859230396fc2ad1 (patch) | |
| tree | ec51bc5012bf6157bf79ab92ef5d5c8b2f684c04 | |
| parent | bcdce942def44cfe19398e386a049c38c874cb93 (diff) | |
| parent | b863fb3744170e5aa44083fd53fa92b3b9c3fb04 (diff) | |
Merge "Make crypto use absolute imports"
| -rw-r--r-- | nova/crypto.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index a8b10de9b..ddc2f76a0 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -22,25 +22,24 @@ Includes root and intermediate CAs, SSH key_pairs and x509 certificates. """ +from __future__ import absolute_import + import base64 -import gettext import hashlib import os import shutil import string import tempfile -import utils import Crypto.Cipher.AES -gettext.install('nova', unicode=1) - from nova.common import cfg from nova import context from nova import db from nova import exception from nova import flags from nova import log as logging +from nova import utils LOG = logging.getLogger("nova.crypto") |