summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2015-01-23 15:34:56 -0500
committerBarry Warsaw <barry@python.org>2015-01-23 15:34:56 -0500
commit3246c85763d5cdebb3e240fcd5ae29834cbf6299 (patch)
tree10fa3d16b31620b8c212f80b7c32f88774a53045 /cloudinit/distros
parent3b798b5d5c3caa5d0e8e534855e29010ca932aaa (diff)
downloadvyos-cloud-init-3246c85763d5cdebb3e240fcd5ae29834cbf6299.tar.gz
vyos-cloud-init-3246c85763d5cdebb3e240fcd5ae29834cbf6299.zip
* Fix the filter() imports.
* In Py3, pass universal_newlines to subprocess.Popen()
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/__init__.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 6b96d58c..00fb95fb 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -36,14 +36,6 @@ from cloudinit import util
from cloudinit.distros.parsers import hosts
-try:
- # Python 3
- from six import filter
-except ImportError:
- # Python 2
- from itertools import ifilter as filter
-
-
OSFAMILIES = {
'debian': ['debian', 'ubuntu'],