From d893a80f0376dbc7a0ff4710b8bc2776d2cd3b69 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Mon, 16 Apr 2018 09:42:03 -0600
Subject: [PATCH] PyPI moved

---
 .bin/Scripts/build_kit.ps1 | 4 ++--
 .bin/Scripts/build_pe.ps1  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.bin/Scripts/build_kit.ps1 b/.bin/Scripts/build_kit.ps1
index 4d456ef5..778c6bb8 100644
--- a/.bin/Scripts/build_kit.ps1
+++ b/.bin/Scripts/build_kit.ps1
@@ -96,7 +96,7 @@ if ($MyInvocation.InvocationName -ne ".") {
     DownloadFile -Path $Path -Name "python64.zip" -Url $Url
 
     # Python: psutil
-    $DownloadPage = "https://pypi.python.org/pypi/psutil"
+    $DownloadPage = "https://pypi.org/project/psutil/"
     $RegEx = "href=.*-cp36-cp36m-win32.whl"
     $Url = FindDynamicUrl $DownloadPage $RegEx
     DownloadFile -Path $Path -Name "psutil32.whl" -Url $Url
@@ -107,7 +107,7 @@ if ($MyInvocation.InvocationName -ne ".") {
     # Python: requests & dependancies
     $RegEx = "href=.*.py3-none-any.whl"
     foreach ($Module in @("chardet", "certifi", "idna", "urllib3", "requests")) {
-        $DownloadPage = "https://pypi.python.org/pypi/$Module"
+        $DownloadPage = "https://pypi.org/project/$Module/"
         $Name = "$Module.whl"
         $Url = FindDynamicUrl -SourcePage $DownloadPage -RegEx $RegEx
         DownloadFile -Path $Path -Name $Name -Url $Url
diff --git a/.bin/Scripts/build_pe.ps1 b/.bin/Scripts/build_pe.ps1
index a49d2c65..459141c0 100644
--- a/.bin/Scripts/build_pe.ps1
+++ b/.bin/Scripts/build_pe.ps1
@@ -164,11 +164,11 @@ if ($MyInvocation.InvocationName -ne ".") {
             # Python: psutil
             @(
                 "psutil64.whl",
-                (FindDynamicUrl "https://pypi.python.org/pypi/psutil" "href=.*-cp36-cp36m-win_amd64.whl")
+                (FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp36-cp36m-win_amd64.whl")
             ),
             @(
                 "psutil32.whl",
-                (FindDynamicUrl "https://pypi.python.org/pypi/psutil" "href=.*-cp36-cp36m-win32.whl")
+                (FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp36-cp36m-win32.whl")
             ),
             # Q-Dir
             @("qdir64.zip", "https://www.softwareok.com/Download/Q-Dir_Portable_x64.zip"),