From 8658b82de7d279ea935c5d04db239fc300003090 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mon, 16 Mar 2015 11:58:03 -0700
Subject: [PATCH] Some code cleanup (removed unused variables and imports)
---
cloud/docker/docker.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index bfc21b94013..2ece52bb9d9 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -355,15 +355,14 @@ HAS_DOCKER_PY = True
import sys
import json
-import re
import os
import shlex
from urlparse import urlparse
try:
import docker.client
import docker.utils
- from requests.exceptions import *
-except ImportError, e:
+ from requests.exceptions import RequestException
+except ImportError:
HAS_DOCKER_PY = False
if HAS_DOCKER_PY:
@@ -1116,7 +1115,6 @@ class DockerManager(object):
for i in self.client.containers(all=True):
running_image = i['Image']
running_command = i['Command'].strip()
- match = False
if name:
matches = name in i.get('Names', [])
@@ -1448,7 +1446,6 @@ def main():
manager = DockerManager(module)
count = int(module.params.get('count'))
name = module.params.get('name')
- image = module.params.get('image')
pull = module.params.get('pull')
state = module.params.get('state')
@@ -1469,7 +1466,6 @@ def main():
manager.pull_image()
containers = ContainerSet(manager)
- failed = False
if state == 'present':
present(manager, containers, count, name)