summaryrefslogtreecommitdiff
path: root/glance/tests/utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'glance/tests/utils.py')
-rw-r--r--glance/tests/utils.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/glance/tests/utils.py b/glance/tests/utils.py
index 0c67a4d68..2c41fe263 100644
--- a/glance/tests/utils.py
+++ b/glance/tests/utils.py
@@ -269,10 +269,7 @@ def fork_exec(cmd,
os.dup2(fptr.fileno(), desc)
except OSError:
pass
- if pass_fds and hasattr(os, 'set_inheritable'):
- # os.set_inheritable() is only available and needed
- # since Python 3.4. On Python 3.3 and older, file descriptors are
- # inheritable by default.
+ if pass_fds:
for fd in pass_fds:
os.set_inheritable(fd, True)