diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-21 13:32:51 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-21 13:33:20 -0400 |
| commit | 22016ee593d6047855964734a17120d2aea6b5a5 (patch) | |
| tree | 92adbca098e89295d4217561ee53454134b781a2 /src/lib/Bcfg2/Server/Plugin.py | |
| parent | d6bf20100848dc61b971844e21d24da44b9f65f7 (diff) | |
| download | bcfg2-22016ee593d6047855964734a17120d2aea6b5a5.tar.gz bcfg2-22016ee593d6047855964734a17120d2aea6b5a5.tar.bz2 bcfg2-22016ee593d6047855964734a17120d2aea6b5a5.zip | |
lots of various py3k fixes
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index 82162aa4a..fa2e16c10 100644 --- a/src/lib/Bcfg2/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -265,7 +265,8 @@ class ThreadedStatistics(Statistics, threading.Thread): (metadata, data) = self.work_queue.get_nowait() try: pending_data.append((metadata.hostname, - lxml.etree.tostring(data))) + lxml.etree.tostring(data, + encoding='unicode'))) except: err = sys.exc_info()[1] self.logger.warning("Dropping interaction for %s: %s" % @@ -560,7 +561,7 @@ class DirectoryBacked(object): event.filename).lstrip('/') if action == 'deleted': - for key in self.entries.keys(): + for key in list(self.entries.keys()): if key.startswith(relpath): del self.entries[key] # We remove values from self.entries, but not |