diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-06-15 15:04:53 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-15 15:04:53 -0500 |
| commit | f4307fd49519f4f086a5674c255174880a8b2b18 (patch) | |
| tree | 84683bf22dc6b5e7c8f1eda1c6e10a5360f70f9b /src/lib/Server/Plugins | |
| parent | 707a17cf8bcf0e91a2c74f671f0d3fffff3c294e (diff) | |
| parent | e145b148dacc9420b2e4253310a0b2f0b07cbada (diff) | |
| download | bcfg2-f4307fd49519f4f086a5674c255174880a8b2b18.tar.gz bcfg2-f4307fd49519f4f086a5674c255174880a8b2b18.tar.bz2 bcfg2-f4307fd49519f4f086a5674c255174880a8b2b18.zip | |
Merge branch 'py3k'
Diffstat (limited to 'src/lib/Server/Plugins')
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 1 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Snapshots.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 4a0fd2dfe..c93b76488 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -24,6 +24,7 @@ except: logger = logging.getLogger('Bcfg2.Plugins.Cfg') +# py3k compatibility def u_str(string, encoding): if sys.hexversion >= 0x03000000: return string.encode(encoding) diff --git a/src/lib/Server/Plugins/Snapshots.py b/src/lib/Server/Plugins/Snapshots.py index 8b6bad574..aeb3b9f74 100644 --- a/src/lib/Server/Plugins/Snapshots.py +++ b/src/lib/Server/Plugins/Snapshots.py @@ -28,6 +28,7 @@ datafields = { } +# py3k compatibility def u_str(string): if sys.hexversion >= 0x03000000: return string |