From 62c23a29b7295b7aeadc94b101677d0b5f9af739 Mon Sep 17 00:00:00 2001 From: Claudiu Popa Date: Thu, 6 Aug 2015 20:03:07 +0300 Subject: [PATCH] Use an explicit absolute import for importing the logging module Change-Id: Ic8a6107e202644a8a5298332712cbf2896a5e408 --- cloudinit/templater.py | 4 +++- cloudinit/url_helper.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cloudinit/templater.py b/cloudinit/templater.py index b38764b5..b9bfe87b 100644 --- a/cloudinit/templater.py +++ b/cloudinit/templater.py @@ -4,7 +4,6 @@ # vi: ts=4 expandtab import collections -import logging import os import re @@ -15,6 +14,9 @@ try: except (ImportError, AttributeError): JINJA_AVAILABLE = False # noqa +from cloudinit import logging + + LOG = logging.getLogger(__name__) TYPE_MATCHER = re.compile(r"##\s*template:(.*)", re.I) BASIC_MATCHER = re.compile(r'\$\{([A-Za-z0-9_.]+)\}|\$([A-Za-z0-9_.]+)') diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py index 423cb08b..effeb683 100644 --- a/cloudinit/url_helper.py +++ b/cloudinit/url_helper.py @@ -3,7 +3,6 @@ # # vi: ts=4 expandtab -import logging import time try: @@ -28,6 +27,7 @@ from six.moves.http_client import CONFLICT # noqa from six.moves.http_client import MULTIPLE_CHOICES as _MULTIPLE_CHOICES from six.moves.http_client import OK +from cloudinit import logging from cloudinit import version