summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Grönholm <alex.gronholm@nextday.fi>2020-12-04 12:00:30 +0200
committerAlex Grönholm <alex.gronholm@nextday.fi>2020-12-04 15:49:35 +0200
commit3eb5ff9e15c8ed4e3b22321df980771d4fb2ee46 (patch)
tree7da11639d1618af28d23b1fc83abdbcce7cffa08
parente6102e58153fa43089b920e3908eeb908170cf44 (diff)
downloadwheel-git-3eb5ff9e15c8ed4e3b22321df980771d4fb2ee46.tar.gz
Fixed TypeError when a unicode generator name was passed on Python 2.7
Fixes #388.
-rw-r--r--docs/news.rst6
-rw-r--r--src/wheel/bdist_wheel.py5
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/news.rst b/docs/news.rst
index 1812e12..debb412 100644
--- a/docs/news.rst
+++ b/docs/news.rst
@@ -1,6 +1,12 @@
Release Notes
=============
+**UNRELEASED**
+
+- Fixed regression introduced in 0.36.0 on Python 2.7 when a custom generator
+ name was passed as unicode (Scikit-build)
+ (``TypeError: 'unicode' does not have the buffer interface``)
+
**0.36.0 (2020-12-01)**
- Added official Python 3.9 support
diff --git a/src/wheel/bdist_wheel.py b/src/wheel/bdist_wheel.py
index 9c9b0a8..80e43d0 100644
--- a/src/wheel/bdist_wheel.py
+++ b/src/wheel/bdist_wheel.py
@@ -373,6 +373,11 @@ class bdist_wheel(Command):
def write_wheelfile(self, wheelfile_base, generator='bdist_wheel (' + wheel_version + ')'):
from email.message import Message
+
+ # Workaround for Python 2.7 for when "generator" is unicode
+ if sys.version_info < (3,) and not isinstance(generator, str):
+ generator = generator.encode('utf-8')
+
msg = Message()
msg['Wheel-Version'] = '1.0' # of the spec
msg['Generator'] = generator