diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-04-21 22:15:16 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-04-21 22:15:16 -0400 |
| commit | aa0de1bba066682a1892ae2dcd1f92ebdd231f7c (patch) | |
| tree | 0e17219355390996a9eaff6835eae38747115b91 /tools | |
| parent | f5ef0e4bf39e01b46db241f5766db60059d52df3 (diff) | |
| parent | 659ae2ce4685034f9979702ca92a361acc23b1b6 (diff) | |
merging trunk
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/esx/guest_tool.py | 2 | ||||
| -rw-r--r-- | tools/pip-requires | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/esx/guest_tool.py b/tools/esx/guest_tool.py index bbf3ea908..13b0f8d33 100644 --- a/tools/esx/guest_tool.py +++ b/tools/esx/guest_tool.py @@ -209,7 +209,7 @@ def _execute(cmd_list, process_input=None, check_exit_code=True): obj = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
result = None
- if process_input != None:
+ if process_input is not None:
result = obj.communicate(process_input)
else:
result = obj.communicate()
diff --git a/tools/pip-requires b/tools/pip-requires index 6ea446493..2f4136732 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -17,7 +17,6 @@ redis==2.0.0 routes==1.12.3 WebOb==0.9.8 wsgiref==0.1.2 -zope.interface==3.6.1 mox==0.5.0 -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz greenlet==0.3.1 |