Merge branch 'hotfix/1.2.1'

TheHive-Project · Jun 29, 2017 · b1645ee · b1645ee
2 parents 36556e0 + 15bdbe3
commit b1645ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='thehive4py',
-    version='1.2.0',
+    version='1.2.1',
     description='Python API client for TheHive.',
     long_description=read_md('README.md'),
     author='TheHive-Project',
@@ -33,5 +33,5 @@
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
     include_package_data=True,
-    install_requires=['requests']
+    install_requires=['future', 'requests', 'python-magic']
 )
diff --git a/thehive4py/models.py b/thehive4py/models.py
@@ -196,4 +196,4 @@ def _prepare_file_data(self, file_path):
             mime = magic.Magic(mime=True).from_file(file_path)
             encoded_string = base64.b64encode(file_artifact.read())
 
-        return filename + ';' + mime + ';' + encoded_string;
+        return "{};{};{}".format(filename, mime, encoded_string.decode())