From 377d1957677c7af631f054fabc3331ee5d57ae36 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 20 Aug 2012 15:20:55 -0400 Subject: py3k unicode fixes --- src/lib/Bcfg2/Bcfg2Py3k.py | 5 +++++ src/lib/Bcfg2/Client/Tools/POSIX/File.py | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py index 784ac118f..640efff95 100644 --- a/src/lib/Bcfg2/Bcfg2Py3k.py +++ b/src/lib/Bcfg2/Bcfg2Py3k.py @@ -77,6 +77,11 @@ def u_str(string, encoding=None): else: return unicode(string) +try: + unicode = str +except: + unicode = unicode + try: input = raw_input except: diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index 9c5697162..1b5535d28 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -6,10 +6,7 @@ import difflib import binascii import tempfile from base import POSIXTool - -# py3k compatibility -if sys.hexversion >= 0x03000000: - unicode = str +from Bcfg2.Bcfg2Py3k import unicode class POSIXFile(POSIXTool): __req__ = ['name', 'perms', 'owner', 'group'] -- cgit v1.2.3-1-g7c22