Commit 77caaee7 authored by Jérome Perrin's avatar Jérome Perrin

component/pylint: add an astroid patch to fix six.moves on py2

parent fc622b1d
Pipeline #34253 failed with stage
in 0 seconds
...@@ -13,6 +13,7 @@ setup-eggs = ${lazy-object-proxy:egg} ...@@ -13,6 +13,7 @@ setup-eggs = ${lazy-object-proxy:egg}
[astroid:python2] [astroid:python2]
patches = patches =
${:_profile_base_location_}/astroid-six_moves_import_error.patch#377beb0c50f52b9608bb6be7bf93096e ${:_profile_base_location_}/astroid-six_moves_import_error.patch#377beb0c50f52b9608bb6be7bf93096e
${:_profile_base_location_}/fix-import-six.moves.urllib.request-on-astroid-1.3.8.patch#266139a893d0eba377ac510fb0fa75f1
patch-options = -p1 patch-options = -p1
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
setup-eggs = setup-eggs =
......
From 67abf302360eab857fb02d1e83a97aff86f31aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 9 Apr 2024 11:04:38 +0900
Subject: [PATCH] fix "import six.moves.urllib.request" on astroid 1.3.8
---
astroid/brain/pysix_moves.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/astroid/brain/pysix_moves.py b/astroid/brain/pysix_moves.py
index 4a82b499..9bf31146 100644
--- a/astroid/brain/pysix_moves.py
+++ b/astroid/brain/pysix_moves.py
@@ -164,6 +164,7 @@ if sys.version_info[0] == 2:
urllib_parse = UrllibParse()
urllib_error = UrllibError()
+ urllib_request = UrllibRequest()
urllib = DummyModule()
urllib.request = UrllibRequest()
urllib.parse = UrllibParse()
--
2.42.0
...@@ -737,7 +737,7 @@ PyPDF2 = 1.26.0+SlapOSPatched001 ...@@ -737,7 +737,7 @@ PyPDF2 = 1.26.0+SlapOSPatched001
## https://lab.nexedi.com/nexedi/slapos/merge_requests/648 ## https://lab.nexedi.com/nexedi/slapos/merge_requests/648
pylint = 1.4.4+SlapOSPatched002 pylint = 1.4.4+SlapOSPatched002
# astroid 1.4.1 breaks testDynamicClassGeneration # astroid 1.4.1 breaks testDynamicClassGeneration
astroid = 1.3.8+SlapOSPatched001 astroid = 1.3.8+SlapOSPatched002
# use newer version than specified in ZTK # use newer version than specified in ZTK
PasteDeploy = 1.5.2 PasteDeploy = 1.5.2
......
...@@ -943,7 +943,7 @@ zope.testbrowser = 5.5.1 ...@@ -943,7 +943,7 @@ zope.testbrowser = 5.5.1
AccessControl = 4.4 AccessControl = 4.4
Acquisition = 4.13 Acquisition = 4.13
APacheDEX = 1.8 APacheDEX = 1.8
astroid = 1.3.8+SlapOSPatched001 astroid = 1.3.8+SlapOSPatched002
AuthEncoding = 4.3 AuthEncoding = 4.3
Chameleon = 3.9.1 Chameleon = 3.9.1
DateTime = 4.9+SlapOSPatched004 DateTime = 4.9+SlapOSPatched004
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment