Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 2 of 2.

11 files changed, 182 insertions, 182 deletions

diff --git a/contrib/tools/python3/src/Lib/distutils/command/bdist_msi.py b/contrib/tools/python3/src/Lib/distutils/command/bdist_msi.py
index 8ab133e18e..0863a1883e 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/bdist_msi.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/bdist_msi.py
@@ -6,9 +6,9 @@
 Implements the bdist_msi command.
 """
 
-import os 
-import sys 
-import warnings 
+import os
+import sys
+import warnings
 from distutils.core import Command
 from distutils.dir_util import remove_tree
 from distutils.sysconfig import get_python_version
@@ -124,12 +124,12 @@ class bdist_msi(Command):
                     '3.5', '3.6', '3.7', '3.8', '3.9']
     other_version = 'X'
 
-    def __init__(self, *args, **kw): 
-        super().__init__(*args, **kw) 
-        warnings.warn("bdist_msi command is deprecated since Python 3.9, " 
-                      "use bdist_wheel (wheel packages) instead", 
-                      DeprecationWarning, 2) 
- 
+    def __init__(self, *args, **kw):
+        super().__init__(*args, **kw)
+        warnings.warn("bdist_msi command is deprecated since Python 3.9, "
+                      "use bdist_wheel (wheel packages) instead",
+                      DeprecationWarning, 2)
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
@@ -398,18 +398,18 @@ class bdist_msi(Command):
         #     entries for each version as the above code does
         if self.pre_install_script:
             scriptfn = os.path.join(self.bdist_dir, "preinstall.bat")
-            with open(scriptfn, "w") as f: 
-                # The batch file will be executed with [PYTHON], so that %1 
-                # is the path to the Python interpreter; %0 will be the path 
-                # of the batch file. 
-                # rem =""" 
-                # %1 %0 
-                # exit 
-                # """ 
-                # <actual script> 
-                f.write('rem ="""\n%1 %0\nexit\n"""\n') 
-                with open(self.pre_install_script) as fin: 
-                    f.write(fin.read()) 
+            with open(scriptfn, "w") as f:
+                # The batch file will be executed with [PYTHON], so that %1
+                # is the path to the Python interpreter; %0 will be the path
+                # of the batch file.
+                # rem ="""
+                # %1 %0
+                # exit
+                # """
+                # <actual script>
+                f.write('rem ="""\n%1 %0\nexit\n"""\n')
+                with open(self.pre_install_script) as fin:
+                    f.write(fin.read())
             add_data(self.db, "Binary",
                 [("PreInstall", msilib.Binary(scriptfn))
                 ])
diff --git a/contrib/tools/python3/src/Lib/distutils/command/bdist_rpm.py b/contrib/tools/python3/src/Lib/distutils/command/bdist_rpm.py
index da98ce6a47..550cbfa1e2 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/bdist_rpm.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/bdist_rpm.py
@@ -308,7 +308,7 @@ class bdist_rpm(Command):
 
         # build package
         log.info("building RPMs")
-        rpm_cmd = ['rpmbuild'] 
+        rpm_cmd = ['rpmbuild']
 
         if self.source_only: # what kind of RPMs?
             rpm_cmd.append('-bs')
@@ -533,8 +533,8 @@ class bdist_rpm(Command):
                     '',
                     '%' + rpm_opt,])
                 if val:
-                    with open(val) as f: 
-                        spec_file.extend(f.read().split('\n')) 
+                    with open(val) as f:
+                        spec_file.extend(f.read().split('\n'))
                 else:
                     spec_file.append(default)
 
diff --git a/contrib/tools/python3/src/Lib/distutils/command/bdist_wininst.py b/contrib/tools/python3/src/Lib/distutils/command/bdist_wininst.py
index 86602327cf..0e9ddaa214 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/bdist_wininst.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/bdist_wininst.py
@@ -3,12 +3,12 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-import os 
-import sys 
-import warnings 
+import os
+import sys
+import warnings
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.dir_util import remove_tree 
+from distutils.dir_util import remove_tree
 from distutils.errors import *
 from distutils.sysconfig import get_python_version
 from distutils import log
@@ -57,15 +57,15 @@ class bdist_wininst(Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
-    # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows 
-    _unsupported = (sys.platform != "win32") 
- 
-    def __init__(self, *args, **kw): 
-        super().__init__(*args, **kw) 
-        warnings.warn("bdist_wininst command is deprecated since Python 3.8, " 
-                      "use bdist_wheel (wheel packages) instead", 
-                      DeprecationWarning, 2) 
- 
+    # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows
+    _unsupported = (sys.platform != "win32")
+
+    def __init__(self, *args, **kw):
+        super().__init__(*args, **kw)
+        warnings.warn("bdist_wininst command is deprecated since Python 3.8, "
+                      "use bdist_wheel (wheel packages) instead",
+                      DeprecationWarning, 2)
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
@@ -258,49 +258,49 @@ class bdist_wininst(Command):
         self.announce("creating %s" % installer_name)
 
         if bitmap:
-            with open(bitmap, "rb") as f: 
-                bitmapdata = f.read() 
+            with open(bitmap, "rb") as f:
+                bitmapdata = f.read()
             bitmaplen = len(bitmapdata)
         else:
             bitmaplen = 0
 
-        with open(installer_name, "wb") as file: 
-            file.write(self.get_exe_bytes()) 
-            if bitmap: 
-                file.write(bitmapdata) 
+        with open(installer_name, "wb") as file:
+            file.write(self.get_exe_bytes())
+            if bitmap:
+                file.write(bitmapdata)
 
-            # Convert cfgdata from unicode to ascii, mbcs encoded 
-            if isinstance(cfgdata, str): 
-                cfgdata = cfgdata.encode("mbcs") 
+            # Convert cfgdata from unicode to ascii, mbcs encoded
+            if isinstance(cfgdata, str):
+                cfgdata = cfgdata.encode("mbcs")
 
-            # Append the pre-install script 
+            # Append the pre-install script
             cfgdata = cfgdata + b"\0"
-            if self.pre_install_script: 
-                # We need to normalize newlines, so we open in text mode and 
-                # convert back to bytes. "latin-1" simply avoids any possible 
-                # failures. 
-                with open(self.pre_install_script, "r", 
-                          encoding="latin-1") as script: 
-                    script_data = script.read().encode("latin-1") 
-                cfgdata = cfgdata + script_data + b"\n\0" 
-            else: 
-                # empty pre-install script 
-                cfgdata = cfgdata + b"\0" 
-            file.write(cfgdata) 
-
-            # The 'magic number' 0x1234567B is used to make sure that the 
-            # binary layout of 'cfgdata' is what the wininst.exe binary 
-            # expects.  If the layout changes, increment that number, make 
-            # the corresponding changes to the wininst.exe sources, and 
-            # recompile them. 
-            header = struct.pack("<iii", 
-                                0x1234567B,       # tag 
-                                len(cfgdata),     # length 
-                                bitmaplen,        # number of bytes in bitmap 
-                                ) 
-            file.write(header) 
-            with open(arcname, "rb") as f: 
-                file.write(f.read()) 
+            if self.pre_install_script:
+                # We need to normalize newlines, so we open in text mode and
+                # convert back to bytes. "latin-1" simply avoids any possible
+                # failures.
+                with open(self.pre_install_script, "r",
+                          encoding="latin-1") as script:
+                    script_data = script.read().encode("latin-1")
+                cfgdata = cfgdata + script_data + b"\n\0"
+            else:
+                # empty pre-install script
+                cfgdata = cfgdata + b"\0"
+            file.write(cfgdata)
+
+            # The 'magic number' 0x1234567B is used to make sure that the
+            # binary layout of 'cfgdata' is what the wininst.exe binary
+            # expects.  If the layout changes, increment that number, make
+            # the corresponding changes to the wininst.exe sources, and
+            # recompile them.
+            header = struct.pack("<iii",
+                                0x1234567B,       # tag
+                                len(cfgdata),     # length
+                                bitmaplen,        # number of bytes in bitmap
+                                )
+            file.write(header)
+            with open(arcname, "rb") as f:
+                file.write(f.read())
 
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
diff --git a/contrib/tools/python3/src/Lib/distutils/command/build.py b/contrib/tools/python3/src/Lib/distutils/command/build.py
index fcdb21192e..a86df0bc7f 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/build.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/build.py
@@ -116,7 +116,7 @@ class build(Command):
             self.build_scripts = os.path.join(self.build_base,
                                               'scripts-%d.%d' % sys.version_info[:2])
 
-        if self.executable is None and sys.executable: 
+        if self.executable is None and sys.executable:
             self.executable = os.path.normpath(sys.executable)
 
         if isinstance(self.parallel, str):
diff --git a/contrib/tools/python3/src/Lib/distutils/command/build_ext.py b/contrib/tools/python3/src/Lib/distutils/command/build_ext.py
index 0785ec2bcb..1a9bd1200f 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/build_ext.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/build_ext.py
@@ -490,8 +490,8 @@ class build_ext(Command):
                   "in 'ext_modules' option (extension '%s'), "
                   "'sources' must be present and must be "
                   "a list of source filenames" % ext.name)
-        # sort to make the resulting .so file build reproducible 
-        sources = sorted(sources) 
+        # sort to make the resulting .so file build reproducible
+        sources = sorted(sources)
 
         ext_path = self.get_ext_fullpath(ext.name)
         depends = sources + ext.depends
@@ -689,15 +689,15 @@ class build_ext(Command):
         provided, "PyInit_" + module_name.  Only relevant on Windows, where
         the .pyd file (DLL) must export the module "PyInit_" function.
         """
-        suffix = '_' + ext.name.split('.')[-1] 
-        try: 
-            # Unicode module name support as defined in PEP-489 
-            # https://www.python.org/dev/peps/pep-0489/#export-hook-name 
-            suffix.encode('ascii') 
-        except UnicodeEncodeError: 
-            suffix = 'U' + suffix.encode('punycode').replace(b'-', b'_').decode('ascii') 
- 
-        initfunc_name = "PyInit" + suffix 
+        suffix = '_' + ext.name.split('.')[-1]
+        try:
+            # Unicode module name support as defined in PEP-489
+            # https://www.python.org/dev/peps/pep-0489/#export-hook-name
+            suffix.encode('ascii')
+        except UnicodeEncodeError:
+            suffix = 'U' + suffix.encode('punycode').replace(b'-', b'_').decode('ascii')
+
+        initfunc_name = "PyInit" + suffix
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
@@ -724,31 +724,31 @@ class build_ext(Command):
                 # extensions, it is a reference to the original list
                 return ext.libraries + [pythonlib]
         else:
-            # On Android only the main executable and LD_PRELOADs are considered 
-            # to be RTLD_GLOBAL, all the dependencies of the main executable 
-            # remain RTLD_LOCAL and so the shared libraries must be linked with 
-            # libpython when python is built with a shared python library (issue 
-            # bpo-21536). 
-            # On Cygwin (and if required, other POSIX-like platforms based on 
-            # Windows like MinGW) it is simply necessary that all symbols in 
-            # shared libraries are resolved at link time. 
-            from distutils.sysconfig import get_config_var 
-            link_libpython = False 
-            if get_config_var('Py_ENABLE_SHARED'): 
-                # A native build on an Android device or on Cygwin 
-                if hasattr(sys, 'getandroidapilevel'): 
-                    link_libpython = True 
-                elif sys.platform == 'cygwin': 
-                    link_libpython = True 
-                elif '_PYTHON_HOST_PLATFORM' in os.environ: 
-                    # We are cross-compiling for one of the relevant platforms 
-                    if get_config_var('ANDROID_API_LEVEL') != 0: 
-                        link_libpython = True 
-                    elif get_config_var('MACHDEP') == 'cygwin': 
-                        link_libpython = True 
- 
-            if link_libpython: 
-                ldversion = get_config_var('LDVERSION') 
-                return ext.libraries + ['python' + ldversion] 
- 
-        return ext.libraries 
+            # On Android only the main executable and LD_PRELOADs are considered
+            # to be RTLD_GLOBAL, all the dependencies of the main executable
+            # remain RTLD_LOCAL and so the shared libraries must be linked with
+            # libpython when python is built with a shared python library (issue
+            # bpo-21536).
+            # On Cygwin (and if required, other POSIX-like platforms based on
+            # Windows like MinGW) it is simply necessary that all symbols in
+            # shared libraries are resolved at link time.
+            from distutils.sysconfig import get_config_var
+            link_libpython = False
+            if get_config_var('Py_ENABLE_SHARED'):
+                # A native build on an Android device or on Cygwin
+                if hasattr(sys, 'getandroidapilevel'):
+                    link_libpython = True
+                elif sys.platform == 'cygwin':
+                    link_libpython = True
+                elif '_PYTHON_HOST_PLATFORM' in os.environ:
+                    # We are cross-compiling for one of the relevant platforms
+                    if get_config_var('ANDROID_API_LEVEL') != 0:
+                        link_libpython = True
+                    elif get_config_var('MACHDEP') == 'cygwin':
+                        link_libpython = True
+
+            if link_libpython:
+                ldversion = get_config_var('LDVERSION')
+                return ext.libraries + ['python' + ldversion]
+
+        return ext.libraries
diff --git a/contrib/tools/python3/src/Lib/distutils/command/build_py.py b/contrib/tools/python3/src/Lib/distutils/command/build_py.py
index 6a830d9e41..edc2171cd1 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/build_py.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/build_py.py
@@ -5,7 +5,7 @@ Implements the Distutils 'build_py' command."""
 import os
 import importlib.util
 import sys
-import glob 
+import glob
 
 from distutils.core import Command
 from distutils.errors import *
@@ -125,7 +125,7 @@ class build_py (Command):
         files = []
         for pattern in globs:
             # Each pattern has to be converted to a platform-specific path
-            filelist = glob.glob(os.path.join(glob.escape(src_dir), convert_path(pattern))) 
+            filelist = glob.glob(os.path.join(glob.escape(src_dir), convert_path(pattern)))
             # Files that match more than one pattern are only added once
             files.extend([fn for fn in filelist if fn not in files
                 and os.path.isfile(fn)])
@@ -216,7 +216,7 @@ class build_py (Command):
 
     def find_package_modules(self, package, package_dir):
         self.check_package(package, package_dir)
-        module_files = glob.glob(os.path.join(glob.escape(package_dir), "*.py")) 
+        module_files = glob.glob(os.path.join(glob.escape(package_dir), "*.py"))
         modules = []
         setup_script = os.path.abspath(self.distribution.script_name)
 
diff --git a/contrib/tools/python3/src/Lib/distutils/command/check.py b/contrib/tools/python3/src/Lib/distutils/command/check.py
index ee734cb1bc..73a30f3afd 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/check.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/check.py
@@ -79,12 +79,12 @@ class check(Command):
     def check_metadata(self):
         """Ensures that all required elements of meta-data are supplied.
 
-        Required fields: 
-            name, version, URL 
+        Required fields:
+            name, version, URL
+
+        Recommended fields:
+            (author and author_email) or (maintainer and maintainer_email)
 
-        Recommended fields: 
-            (author and author_email) or (maintainer and maintainer_email) 
- 
         Warns if any are missing.
         """
         metadata = self.distribution.metadata
@@ -99,15 +99,15 @@ class check(Command):
         if metadata.author:
             if not metadata.author_email:
                 self.warn("missing meta-data: if 'author' supplied, " +
-                          "'author_email' should be supplied too") 
+                          "'author_email' should be supplied too")
         elif metadata.maintainer:
             if not metadata.maintainer_email:
                 self.warn("missing meta-data: if 'maintainer' supplied, " +
-                          "'maintainer_email' should be supplied too") 
+                          "'maintainer_email' should be supplied too")
         else:
             self.warn("missing meta-data: either (author and author_email) " +
                       "or (maintainer and maintainer_email) " +
-                      "should be supplied") 
+                      "should be supplied")
 
     def check_restructuredtext(self):
         """Checks if the long string fields are reST-compliant."""
@@ -122,8 +122,8 @@ class check(Command):
 
     def _check_rst_data(self, data):
         """Returns warnings when the provided data doesn't compile."""
-        # the include and csv_table directives need this to be a path 
-        source_path = self.distribution.script_name or 'setup.py' 
+        # the include and csv_table directives need this to be a path
+        source_path = self.distribution.script_name or 'setup.py'
         parser = Parser()
         settings = frontend.OptionParser(components=(Parser,)).get_default_values()
         settings.tab_width = 4
diff --git a/contrib/tools/python3/src/Lib/distutils/command/config.py b/contrib/tools/python3/src/Lib/distutils/command/config.py
index 316c2886c6..aeda408e73 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/config.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/config.py
@@ -106,14 +106,14 @@ class config(Command):
 
     def _gen_temp_sourcefile(self, body, headers, lang):
         filename = "_configtest" + LANG_EXT[lang]
-        with open(filename, "w") as file: 
-            if headers: 
-                for header in headers: 
-                    file.write("#include <%s>\n" % header) 
-                file.write("\n") 
-            file.write(body) 
-            if body[-1] != "\n": 
-                file.write("\n") 
+        with open(filename, "w") as file:
+            if headers:
+                for header in headers:
+                    file.write("#include <%s>\n" % header)
+                file.write("\n")
+            file.write(body)
+            if body[-1] != "\n":
+                file.write("\n")
         return filename
 
     def _preprocess(self, body, headers, include_dirs, lang):
@@ -202,15 +202,15 @@ class config(Command):
         if isinstance(pattern, str):
             pattern = re.compile(pattern)
 
-        with open(out) as file: 
-            match = False 
-            while True: 
-                line = file.readline() 
-                if line == '': 
-                    break 
-                if pattern.search(line): 
-                    match = True 
-                    break 
+        with open(out) as file:
+            match = False
+            while True:
+                line = file.readline()
+                if line == '':
+                    break
+                if pattern.search(line):
+                    match = True
+                    break
 
         self._clean()
         return match
diff --git a/contrib/tools/python3/src/Lib/distutils/command/install.py b/contrib/tools/python3/src/Lib/distutils/command/install.py
index 3f38e34363..aaa300efa9 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/install.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/install.py
@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
 INSTALL_SCHEMES = {
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages', 
+        'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages',
         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
     'unix_home': {
         'purelib': '$base/lib/python',
-        'platlib': '$base/$platlibdir/python', 
+        'platlib': '$base/$platlibdir/python',
         'headers': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
@@ -223,7 +223,7 @@ class install(Command):
 
     def finalize_options(self):
         """Finalizes options."""
-        # This method (and its helpers, like 'finalize_unix()', 
+        # This method (and its helpers, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
         # installation directories for modules, extension modules, and
         # anything else we care to install from a Python module
@@ -298,7 +298,7 @@ class install(Command):
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
                             'abiflags': abiflags,
-                            'platlibdir': sys.platlibdir, 
+                            'platlibdir': sys.platlibdir,
                            }
 
         if HAS_USER_SITE:
diff --git a/contrib/tools/python3/src/Lib/distutils/command/sdist.py b/contrib/tools/python3/src/Lib/distutils/command/sdist.py
index eae03d8cce..b4996fcb1d 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/sdist.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/sdist.py
@@ -407,13 +407,13 @@ class sdist(Command):
         distribution.
         """
         log.info("reading manifest file '%s'", self.manifest)
-        with open(self.manifest) as manifest: 
-            for line in manifest: 
-                # ignore comments and blank lines 
-                line = line.strip() 
-                if line.startswith('#') or not line: 
-                    continue 
-                self.filelist.append(line) 
+        with open(self.manifest) as manifest:
+            for line in manifest:
+                # ignore comments and blank lines
+                line = line.strip()
+                if line.startswith('#') or not line:
+                    continue
+                self.filelist.append(line)
 
     def make_release_tree(self, base_dir, files):
         """Create the directory tree that will become the source
diff --git a/contrib/tools/python3/src/Lib/distutils/command/upload.py b/contrib/tools/python3/src/Lib/distutils/command/upload.py
index d23a29c8ab..e0ecb655b9 100644
--- a/contrib/tools/python3/src/Lib/distutils/command/upload.py
+++ b/contrib/tools/python3/src/Lib/distutils/command/upload.py
@@ -9,24 +9,24 @@ import os
 import io
 import hashlib
 from base64 import standard_b64encode
-from urllib.error import HTTPError 
-from urllib.request import urlopen, Request 
+from urllib.error import HTTPError
+from urllib.request import urlopen, Request
 from urllib.parse import urlparse
 from distutils.errors import DistutilsError, DistutilsOptionError
 from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
 
- 
-# PyPI Warehouse supports MD5, SHA256, and Blake2 (blake2-256) 
-# https://bugs.python.org/issue40698 
-_FILE_CONTENT_DIGESTS = { 
-    "md5_digest": getattr(hashlib, "md5", None), 
-    "sha256_digest": getattr(hashlib, "sha256", None), 
-    "blake2_256_digest": getattr(hashlib, "blake2b", None), 
-} 
- 
- 
+
+# PyPI Warehouse supports MD5, SHA256, and Blake2 (blake2-256)
+# https://bugs.python.org/issue40698
+_FILE_CONTENT_DIGESTS = {
+    "md5_digest": getattr(hashlib, "md5", None),
+    "sha256_digest": getattr(hashlib, "sha256", None),
+    "blake2_256_digest": getattr(hashlib, "blake2b", None),
+}
+
+
 class upload(PyPIRCCommand):
 
     description = "upload binary package to PyPI"
@@ -98,7 +98,7 @@ class upload(PyPIRCCommand):
             content = f.read()
         finally:
             f.close()
- 
+
         meta = self.distribution.metadata
         data = {
             # action
@@ -132,22 +132,22 @@ class upload(PyPIRCCommand):
             'obsoletes': meta.get_obsoletes(),
             }
 
-        data['comment'] = '' 
- 
-        # file content digests 
-        for digest_name, digest_cons in _FILE_CONTENT_DIGESTS.items(): 
-            if digest_cons is None: 
-                continue 
-            try: 
-                data[digest_name] = digest_cons(content).hexdigest() 
-            except ValueError: 
-                # hash digest not available or blocked by security policy 
-                pass 
- 
+        data['comment'] = ''
+
+        # file content digests
+        for digest_name, digest_cons in _FILE_CONTENT_DIGESTS.items():
+            if digest_cons is None:
+                continue
+            try:
+                data[digest_name] = digest_cons(content).hexdigest()
+            except ValueError:
+                # hash digest not available or blocked by security policy
+                pass
+
         if self.sign:
-            with open(filename + ".asc", "rb") as f: 
-                data['gpg_signature'] = (os.path.basename(filename) + ".asc", 
-                                         f.read()) 
+            with open(filename + ".asc", "rb") as f:
+                data['gpg_signature'] = (os.path.basename(filename) + ".asc",
+                                         f.read())
 
         # set up the authentication
         user_pass = (self.username + ":" + self.password).encode('ascii')