Sync with Package Control

wbond · Oct 14, 2023 · 492ce55 · 492ce55
1 parent 4f4e861
commit 492ce55
Show file tree

Hide file tree

Showing 6 changed files with 866 additions and 842 deletions.
diff --git a/app/lib/package_control/__init__.py b/app/lib/package_control/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "4.0.0-beta4"
-__version_info__ = (4, 0, 0, 'beta', 4)
+__version__ = "4.0.0-beta8"
+__version_info__ = (4, 0, 0, 'beta', 8)
diff --git a/app/lib/package_control/downloaders/oscrypto_downloader.py b/app/lib/package_control/downloaders/oscrypto_downloader.py
@@ -171,7 +171,7 @@ def download(self, url, error_message, timeout, tries, prefer_cached=False):
                 if code == 304:
                     return self.cache_result('get', url, code, resp_headers, b'')
 
-                if code == 301:
+                if code == 301 or code == 302:
                     location = resp_headers.get('location')
                     if not isinstance(location, str):
                         raise OscryptoDownloaderException('Missing or duplicate Location HTTP header')

diff --git a/app/lib/package_control/providers/__init__.py b/app/lib/package_control/providers/__init__.py
@@ -3,7 +3,7 @@
 from .github_user_provider import GitHubUserProvider
 from .gitlab_repository_provider import GitLabRepositoryProvider
 from .gitlab_user_provider import GitLabUserProvider
-from .repository_provider import RepositoryProvider
+from .json_repository_provider import JsonRepositoryProvider
 
 from .channel_provider import ChannelProvider
 
@@ -14,7 +14,7 @@
     GitHubUserProvider,
     GitLabRepositoryProvider,
     GitLabUserProvider,
-    RepositoryProvider
+    JsonRepositoryProvider
 ]
 
 CHANNEL_PROVIDERS = [ChannelProvider]