summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Bcfg2Py3k.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-15 08:21:45 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-15 08:21:45 -0400
commitb455dafd90b9710020f798cd73d63cd049685695 (patch)
tree0456007832aa19bc5d8bea84cbb647492926c7e2 /src/lib/Bcfg2/Bcfg2Py3k.py
parent06a2efea2f666b94eaf7e74bda798ed261fc47de (diff)
parente911b57eb38dfa0fc06d19e70e02e121ae721e57 (diff)
downloadbcfg2-b455dafd90b9710020f798cd73d63cd049685695.tar.gz
bcfg2-b455dafd90b9710020f798cd73d63cd049685695.tar.bz2
bcfg2-b455dafd90b9710020f798cd73d63cd049685695.zip
Merge branch 'tests'
Diffstat (limited to 'src/lib/Bcfg2/Bcfg2Py3k.py')
-rw-r--r--src/lib/Bcfg2/Bcfg2Py3k.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py
index 7b0c6a2b5..7fce94789 100644
--- a/src/lib/Bcfg2/Bcfg2Py3k.py
+++ b/src/lib/Bcfg2/Bcfg2Py3k.py
@@ -88,11 +88,6 @@ except NameError:
import functools
reduce = functools.reduce
-if sys.hexversion >= 0x03000000:
- from io import FileIO as file
-else:
- file = file
-
try:
from collections import MutableMapping
except ImportError: