Fixed python3 bugs in setup.py

setup.py

@@ -22,8 +22,8 @@ except ImportError:
 # include the git commit hash as part of the version number reported
 # by binwalk.
 try:
-    label = subprocess.check_output(["git", "describe"], stderr=DEVNULL)
-    MODULE_VERSION += "-" + label.split('-')[-1].strip()
+    label = subprocess.check_output(["git", "describe"], stderr=DEVNULL).decode('utf-8')
+    MODULE_VERSION = "%s-%s" % (MODULE_VERSION, label.split('-')[-1].strip())
 except subprocess.CalledProcessError:
     pass
 
@@ -259,7 +259,7 @@ for data_dir in ["magic", "config", "plugins", "modules", "core"]:
 # This file is excluded from git in the .gitignore file.
 sys.stdout.write("creating %s%s" % (VERSION_FILE, os.linesep))
 with open(VERSION_FILE, "w") as fp:
-    fp.write("# This file has been auto-generated by setup.py" + os.linesep)
+    fp.write("# This file has been auto-generated by setup.py\n")
     fp.write('__version__ = "%s"' % MODULE_VERSION)
 
 # Install the module, script, and support files