Cleanup

poetry/masonry/publishing/uploader.py

@@ -24,8 +24,6 @@ wheel_file_re = re.compile(
     re.VERBOSE
     re.VERBOSE
 )
 )
 
 
-KEYWORDS_TO_NOT_FLATTEN = {'gpg_signature', 'content'}
-
 _has_blake2 = hasattr(hashlib, 'blake2b')
 _has_blake2 = hasattr(hashlib, 'blake2b')
 
 
 
 
@@ -284,8 +282,7 @@ class Uploader:
     def _prepare_data(self, data):
     def _prepare_data(self, data):
         data_to_send = []
         data_to_send = []
         for key, value in data.items():
         for key, value in data.items():
-            if (key in KEYWORDS_TO_NOT_FLATTEN or
-                    not isinstance(value, (list, tuple))):
+            if not isinstance(value, (list, tuple)):
                 data_to_send.append((key, value))
                 data_to_send.append((key, value))
             else:
             else:
                 for item in value:
                 for item in value:

poetry/masonry/utils/tags.py

-"""Generate and work with PEP 425 Compatibility Tags."""
+"""
+Generate and work with PEP 425 Compatibility Tags.
+
+Base implementation taken from
+https://github.com/pypa/wheel/blob/master/wheel/pep425tags.py
+and adapted to work with poetry's venv util.
+"""
 
 
 import distutils.util
 import distutils.util
 import sys
 import sys