x
/
cloud-init
Code Issues Proposed changes

Merge "Use an explicit absolute import for importing the logging module"

This commit is contained in:
Jenkins 2015-08-07 09:38:38 +00:00 committed by Gerrit Code Review
parent fe616bf41b 62c23a29b7
commit 9da7967e49
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudinit/templater.py
View File

@ -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_.]+)')

2
cloudinit/url_helper.py
View File

@ -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