From cf391a2cdf7c527c32fd57ce66f2b2bfe40f5248 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 14 Jul 2020 10:13:16 +0100
Subject: [PATCH] Start upgrading codebase to Py3 for every changed file

---
 .ci/pre-commit                 | 11 ++++++++++-
 .pre-commit-config.yaml        | 13 +++++++++++++
 .pylintrc                      |  1 -
 cicd/jenkins/pre-commit        | 11 ++++++++++-
 salt/client/ssh/ssh_py_shim.py |  2 +-
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.ci/pre-commit b/.ci/pre-commit
index ad263df0a8b..fedd031005b 100644
--- a/.ci/pre-commit
+++ b/.ci/pre-commit
@@ -1,6 +1,15 @@
 @Library('salt@master-1.7') _
 
+if (env.CHANGE_ID) {
+    // This is a PR
+    pre_commit_skips = ''
+} else {
+    // This is a branch build
+    pre_commit_skips = 'pyupgrade'
+}
+
 runPreCommit(
-    env: env)
+    env: env,
+    pre_commit_skips: pre_commit_skips)
 
 // vim: ft=groovy
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 89fb5a28798..16b21ff6ed9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -690,6 +690,19 @@ repos:
           - --py-version=3.9
   # <---- Invoke -----------------------------------------------------------------------------------------------------
 
+  - repo: https://github.com/asottile/pyupgrade
+    # This, for now, is meant to run when locally committing code and will be disabled(skipped) when we run pre-commit
+    # against all codebase to avoid MASSIVE code churn. This way, we do it in smaller chunks, a few at a time.
+    rev: v2.7.2
+    hooks:
+      - id: pyupgrade
+        name: Drop six usage and Py2 support
+        args: [--py3-plus, --keep-mock]
+        exclude: >
+          (?x)^(
+            salt/client/ssh/ssh_py_shim.py
+          )$
+
   - repo: https://github.com/timothycrosley/isort
     rev: "1e78a9acf3110e1f9721feb591f89a451fc9876a"
     hooks:
diff --git a/.pylintrc b/.pylintrc
index dd42bbdc22e..617b6b6cfd3 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -30,7 +30,6 @@ limit-inference-results=100
 # List of plugins (as comma separated values of python module names) to load,
 # usually to register additional checkers.
 load-plugins=saltpylint.pep8,
-  saltpylint.pep263,
   saltpylint.strings,
   saltpylint.fileperms,
   saltpylint.py3modernize,
diff --git a/cicd/jenkins/pre-commit b/cicd/jenkins/pre-commit
index ad263df0a8b..fedd031005b 100644
--- a/cicd/jenkins/pre-commit
+++ b/cicd/jenkins/pre-commit
@@ -1,6 +1,15 @@
 @Library('salt@master-1.7') _
 
+if (env.CHANGE_ID) {
+    // This is a PR
+    pre_commit_skips = ''
+} else {
+    // This is a branch build
+    pre_commit_skips = 'pyupgrade'
+}
+
 runPreCommit(
-    env: env)
+    env: env,
+    pre_commit_skips: pre_commit_skips)
 
 // vim: ft=groovy
diff --git a/salt/client/ssh/ssh_py_shim.py b/salt/client/ssh/ssh_py_shim.py
index 59e6860042c..c0ce0fd7de5 100644
--- a/salt/client/ssh/ssh_py_shim.py
+++ b/salt/client/ssh/ssh_py_shim.py
@@ -1,4 +1,4 @@
-# pylint: disable=no-encoding-in-file,resource-leakage
+# pylint: disable=resource-leakage
 """
 This is a shim that handles checking and updating salt thin and
 then invoking thin.