Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 19 insertions, 1 deletions

diff --git a/x.py b/x.py
index b8cdf6771..ba959a304 100755
--- a/x.py
+++ b/x.py
@@ -9,12 +9,17 @@
 if __name__ == '__main__':
     import os
     import sys
+    import warnings
+    from inspect import cleandoc
+
+    major = sys.version_info.major
+    minor = sys.version_info.minor
 
     # If this is python2, check if python3 is available and re-execute with that
     # interpreter. Only python3 allows downloading CI LLVM.
     #
     # This matters if someone's system `python` is python2.
-    if sys.version_info.major < 3:
+    if major < 3:
         try:
             os.execvp("py", ["py", "-3"] + sys.argv)
         except OSError:
@@ -24,6 +29,19 @@ if __name__ == '__main__':
                 # Python 3 isn't available, fall back to python 2
                 pass
 
+    # soft deprecation of old python versions
+    skip_check = os.environ.get("RUST_IGNORE_OLD_PYTHON") == "1"
+    if not skip_check and (major < 3 or (major == 3 and minor < 6)):
+        msg = cleandoc("""
+            Using python {}.{} but >= 3.6 is recommended. Your python version
+            should continue to work for the near future, but this will
+            eventually change. If python >= 3.6 is not available on your system,
+            please file an issue to help us understand timelines.
+
+            This message can be suppressed by setting `RUST_IGNORE_OLD_PYTHON=1`
+        """.format(major, minor))
+        warnings.warn(msg)
+
     rust_dir = os.path.dirname(os.path.abspath(__file__))
     # For the import below, have Python search in src/bootstrap first.
     sys.path.insert(0, os.path.join(rust_dir, "src", "bootstrap"))