aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-03 10:20:12 +0000
committerGerrit Code Review <review@openstack.org>2016-05-03 10:20:12 +0000
commitbf6b2a4458716908b18ffffcef18463518aa314b (patch)
treeaae249f32e36e6fd69abd4ec130686bdca0218bf
parente522064f3f57c6566fce2872d382e7c2b549d445 (diff)
parentcc33c103d412d5032ba638d0894f45528f2db2b7 (diff)
downloadkolla-bf6b2a4458716908b18ffffcef18463518aa314b.tar.gz
kolla-bf6b2a4458716908b18ffffcef18463518aa314b.zip
Merge "Adding a few #nosec tags to prepare for Bandit usage"
-rwxr-xr-xkolla/cmd/build.py3
-rw-r--r--setup.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py
index 477d85c18..5a00b1d80 100755
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@@ -473,7 +473,8 @@ class KollaWorker(object):
kolla_version = version.version_info.cached_version_string()
for path in self.docker_build_paths:
template_name = "Dockerfile.j2"
- env = jinja2.Environment(loader=jinja2.FileSystemLoader(path))
+ env = jinja2.Environment( # nosec: not used to render HTML
+ loader=jinja2.FileSystemLoader(path))
template = env.get_template(template_name)
values = {'base_distro': self.base,
'base_distro_tag': self.base_tag,
diff --git a/setup.py b/setup.py
index 782bb21f0..c48a5b867 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ import setuptools
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
-except ImportError:
+except ImportError: # nosec : empty pass is expected behavior
pass
setuptools.setup(