summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/Cfg.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Server/Plugins/Cfg.py')
-rw-r--r--src/lib/Server/Plugins/Cfg.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py
index f202628cd..0a791f171 100644
--- a/src/lib/Server/Plugins/Cfg.py
+++ b/src/lib/Server/Plugins/Cfg.py
@@ -12,6 +12,7 @@ import stat
import sys
import tempfile
from subprocess import Popen, PIPE
+from Bcfg2.Bcfg2Py3k import u_str
import Bcfg2.Server.Plugin
@@ -33,14 +34,6 @@ except:
logger = logging.getLogger('Bcfg2.Plugins.Cfg')
-# py3k compatibility
-def u_str(string, encoding):
- if sys.hexversion >= 0x03000000:
- return string.encode(encoding)
- else:
- return unicode(string, encoding)
-
-
# snipped from TGenshi
def removecomment(stream):
"""A genshi filter that removes comments from the stream."""