diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-23 07:58:04 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-23 07:58:04 -0400 |
| commit | 99fc1b0724ecef423c50bdf13666f6633c3765ef (patch) | |
| tree | a42a2ba59838296b929829c6a7ac9f94fc5e29af /src/lib/Bcfg2/Server/Plugin.py | |
| parent | e9aa3cf5f15e06f3af837792a5fae967514cd0e5 (diff) | |
| download | bcfg2-99fc1b0724ecef423c50bdf13666f6633c3765ef.tar.gz bcfg2-99fc1b0724ecef423c50bdf13666f6633c3765ef.tar.bz2 bcfg2-99fc1b0724ecef423c50bdf13666f6633c3765ef.zip | |
removed or fixed functools imports
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin.py | 8 |
1 files changed, 2 insertions, 6 deletions
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, |