Merge branch 'master' of github.com:CIRCL/PyMISP

pull/24/head
Raphaël Vinot 2016-07-28 09:50:57 +02:00
commit fd5c22d8d9
1 changed files with 1 additions and 1 deletions

View File

@ -677,7 +677,7 @@ class PyMISP(object):
def _encode_file_to_upload(self, path): def _encode_file_to_upload(self, path):
with open(path, 'rb') as f: with open(path, 'rb') as f:
return base64.b64encode(f.read()) return str(base64.b64encode(f.read()))
def upload_sample(self, filename, filepath, event_id, distribution, to_ids, def upload_sample(self, filename, filepath, event_id, distribution, to_ids,
category, comment, info, analysis, threat_level_id): category, comment, info, analysis, threat_level_id):