Drop Python 2 string instance support

Author: homebysix

pre_commit_hooks/util.py

@@ -103,9 +103,6 @@ def validate_pkginfo_key_types(pkginfo, filename):
     Used for AutoPkg- and Munki-related hooks.
     """
 
-    # Remap string type to support unicode in both Python 2 and 3
-    string = basestring if sys.version_info.major == 2 else str
-
     # Pkginfo keys and their known types. Omitted keys are left unvalidated.
     # Source: https://github.com/munki/munki/wiki/Supported-Pkginfo-Keys
     # Last updated 2019-03-13.
@@ -115,58 +112,58 @@ def validate_pkginfo_key_types(pkginfo, filename):
         "autoremove": bool,
         "blocking_applications": list,
         "catalogs": list,
-        "category": string,
+        "category": str,
         "copy_local": bool,
-        "description": string,
-        "developer": string,
-        "display_name": string,
+        "description": str,
+        "developer": str,
+        "display_name": str,
         "force_install_after_date": datetime,
         "forced_install": bool,
         "forced_uninstall": bool,
-        "icon_name": string,
-        "installable_condition": string,
+        "icon_name": str,
+        "installable_condition": str,
         "installed_size": int,
-        "installer_item_hash": string,
-        "installer_item_location": string,
+        "installer_item_hash": str,
+        "installer_item_location": str,
         "installer_item_size": int,
-        "installer_type": string,
+        "installer_type": str,
         "installs": list,
         "items_to_copy": list,
         "installer_choices_xml": list,
         "installer_environment": dict,
         "localized_strings": dict,
-        "minimum_munki_version": string,
-        "minimum_os_version": string,
-        "maximum_os_version": string,
-        "name": string,
-        "notes": string,
-        "PackageCompleteURL": string,
-        "PackageURL": string,
-        "package_path": string,
-        "installcheck_script": string,
-        "uninstallcheck_script": string,
+        "minimum_munki_version": str,
+        "minimum_os_version": str,
+        "maximum_os_version": str,
+        "name": str,
+        "notes": str,
+        "PackageCompleteURL": str,
+        "PackageURL": str,
+        "package_path": str,
+        "installcheck_script": str,
+        "uninstallcheck_script": str,
         "OnDemand": bool,
-        "postinstall_script": string,
-        "postuninstall_script": string,
+        "postinstall_script": str,
+        "postuninstall_script": str,
         "precache": bool,
         "preinstall_alert": dict,
         "preuninstall_alert": dict,
         "preupgrade_alert": dict,
-        "preinstall_script": string,
-        "preuninstall_script": string,
+        "preinstall_script": str,
+        "preuninstall_script": str,
         "receipts": list,
         "requires": list,
-        "RestartAction": string,
+        "RestartAction": str,
         "supported_architectures": list,
         "suppress_bundle_relocation": bool,
         "unattended_install": bool,
         "unattended_uninstall": bool,
-        "uninstall_method": string,
-        "uninstall_script": string,
-        "uninstaller_item_location": string,
+        "uninstall_method": str,
+        "uninstall_script": str,
+        "uninstaller_item_location": str,
         "uninstallable": bool,
         "update_for": list,
-        "version": string,
+        "version": str,
     }
 
     passed = True