summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-04-08 17:15:50 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-04-08 17:17:02 -0500
commitac028179e16549ccb318e98091dce2e6de12bd84 (patch)
tree758c26ee379722f7f7a7fda17d89267cbb9ddf21
parenteca67b6890156a6d297e6e0b00ec84c1d900a622 (diff)
downloadbcfg2-ac028179e16549ccb318e98091dce2e6de12bd84.tar.gz
bcfg2-ac028179e16549ccb318e98091dce2e6de12bd84.tar.bz2
bcfg2-ac028179e16549ccb318e98091dce2e6de12bd84.zip
LocalFilesystem: Use binary data format
The pickle class returns 'bytes' objects in python 3 instead of 'str' objects which were returned in python2. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--src/lib/Bcfg2/Reporting/Transport/LocalFilesystem.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Reporting/Transport/LocalFilesystem.py b/src/lib/Bcfg2/Reporting/Transport/LocalFilesystem.py
index 0a0f032e5..c7d5c512a 100644
--- a/src/lib/Bcfg2/Reporting/Transport/LocalFilesystem.py
+++ b/src/lib/Bcfg2/Reporting/Transport/LocalFilesystem.py
@@ -87,7 +87,7 @@ class LocalFilesystem(TransportBase):
# using a tmpfile to hopefully avoid the file monitor from grabbing too
# soon
- saved = open(tmp_file, 'w')
+ saved = open(tmp_file, 'wb')
try:
saved.write(payload)
except IOError:
@@ -123,7 +123,7 @@ class LocalFilesystem(TransportBase):
self.debug_log("Handling event %s" % event.filename)
payload = os.path.join(self.work_path, event.filename)
try:
- payloadfd = open(payload, "r")
+ payloadfd = open(payload, "rb")
interaction = cPickle.load(payloadfd)
payloadfd.close()
os.unlink(payload)