summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Core.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-23 07:58:04 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-23 07:58:04 -0400
commit99fc1b0724ecef423c50bdf13666f6633c3765ef (patch)
treea42a2ba59838296b929829c6a7ac9f94fc5e29af /src/lib/Bcfg2/Server/Core.py
parente9aa3cf5f15e06f3af837792a5fae967514cd0e5 (diff)
downloadbcfg2-99fc1b0724ecef423c50bdf13666f6633c3765ef.tar.gz
bcfg2-99fc1b0724ecef423c50bdf13666f6633c3765ef.tar.bz2
bcfg2-99fc1b0724ecef423c50bdf13666f6633c3765ef.zip
removed or fixed functools imports
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r--src/lib/Bcfg2/Server/Core.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index d518e0e92..f39453edd 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -14,12 +14,9 @@ import Bcfg2.settings
import Bcfg2.Server
import Bcfg2.Logger
import Bcfg2.Server.FileMonitor
-from Bcfg2.Bcfg2Py3k import xmlrpclib
+from Bcfg2.Bcfg2Py3k import xmlrpclib, reduce
from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError
-if sys.hexversion >= 0x03000000:
- from functools import reduce
-
try:
import psyco
psyco.full()