merge hell

uncompyle6/main.py

@@ -102,8 +102,7 @@ def decompile(
             __version__,
             co_pypy_str,
             bytecode_version,
-            " (%s)" % str(magic_int) if magic_int else "",
-            run_pypy_str,
+           " (%s)" % m, run_pypy_str,
             "\n# ".join(sys_version_lines),
         )
     )

uncompyle6/util.py

@@ -13,11 +13,6 @@ except:
 
 from uncompyle6 import PYTHON_VERSION
 
-def is_negative_zero(n):
-    """Returns true if n is -0.0"""
-    return n == 0.0 and copysign(1, n) == -1
-
-
 def better_repr(v, version):
     """Work around Python's unorthogonal and unhelpful repr() for primitive float
     and complex."""