From 99fc1b0724ecef423c50bdf13666f6633c3765ef Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 23 Aug 2012 07:58:04 -0400
Subject: removed or fixed functools imports

---
 src/lib/Bcfg2/Server/Plugin.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/lib/Bcfg2/Server/Plugin.py')

diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py
index f841cef22..822f2894a 100644
--- a/src/lib/Bcfg2/Server/Plugin.py
+++ b/src/lib/Bcfg2/Server/Plugin.py
@@ -10,7 +10,8 @@ import threading
 import lxml.etree
 import Bcfg2.Server
 import Bcfg2.Options
-from Bcfg2.Bcfg2Py3k import ConfigParser, CmpMixin
+from Bcfg2.Bcfg2Py3k import ConfigParser, CmpMixin, reduce, Queue, Empty, \
+    Full, cPickle
 
 try:
     import django
@@ -18,11 +19,6 @@ try:
 except ImportError:
     has_django = False
 
-# py3k compatibility
-if sys.hexversion >= 0x03000000:
-    from functools import reduce
-from Bcfg2.Bcfg2Py3k import Queue, Empty, Full, cPickle
-
 # grab default metadata info from bcfg2.conf
 opts = {'owner': Bcfg2.Options.MDATA_OWNER,
         'group': Bcfg2.Options.MDATA_GROUP,
-- 
cgit v1.2.3-1-g7c22