Attachment #440659 for bug #231381

View Details Raw Unified Return to Bug 231381

| Differences between

Lines 1-5 a/Source/Makefile_sec1
- a/Source/Makefile +1 lines
1	WEBINSPECTORUI_MODULE =	1	WEBINSPECTORUI_MODULE =
2		2
		3
3	TO_LOWER = $(shell echo $(1) \| tr [:upper:] [:lower:])	4	TO_LOWER = $(shell echo $(1) \| tr [:upper:] [:lower:])
4		5
5	ifneq (,$(SDKROOT))	6	ifneq (,$(SDKROOT))



2021-10-07  Michael Catanzaro  <mcatanzaro@gnome.org>

        webkitpy keyring test bug
        https://bugs.webkit.org/show_bug.cgi?id=231381

        Reviewed by NOBODY (OOPS!).

        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py:
        * Scripts/webkitpy/autoinstalled/__init__.py: Removed.
        * Scripts/webkitpy/autoinstalled/buildbot.py: Removed.
        * Scripts/webkitpy/autoinstalled/chromedriver.py: Removed.
        * Scripts/webkitpy/autoinstalled/geckodriver.py: Removed.
        * Scripts/webkitpy/autoinstalled/twisted.py: Removed.

2021-10-08  Carlos Garcia Campos  <cgarcia@igalia.com>

        [WebDriver] Update w3c and selenium tests



from webkitcorepy.editor import Editor
from webkitcorepy.file_lock import FileLock

version = Version(0, 11, 2)

from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):

AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))
AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
AutoInstall.register(Package('idna', Version(2, 10)))
AutoInstall.register(Package('keyring', Version(7, 3, 1)))
AutoInstall.register(Package('packaging', Version(20, 4)))
AutoInstall.register(Package('pyparsing', Version(2, 4, 7)))
AutoInstall.register(Package('requests', Version(2, 24)))

AutoInstall.register(Package('wheel', Version(0, 35, 1)))
AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))

if sys.version_info > (3, 6):
    keyring_deps = []
    if sys.platform == 'linux':
        AutoInstall.register(Package('jeepney', Version(0, 7, 1)))
        AutoInstall.register(Package('secretstorage', Version(3, 3, 1)))
        keyring_deps = ['secretstorage']
    AutoInstall.register(Package('keyring', Version(23, 2, 1), implicit_deps=keyring_deps))

name = 'webkitcorepy'

Lines 47-52 elif sys.version_info >= (2, 7) and sys.version_info < (3,): a/Tools/Scripts/webkitpy/__init__.py_sec1
- a/Tools/Scripts/webkitpy/__init__.py -1 / +5 lines
47	else:	47	else:
48	raise ImportError("Unsupported Python version! (%s)" % sys.version)	48	raise ImportError("Unsupported Python version! (%s)" % sys.version)
49		49
		50	if sys.version_info >= (3, 6):
		51	AutoInstall.register(Package('importlib_metadata', Version(4, 8, 1)))
		52	else:
		53	AutoInstall.register(Package('importlib_metadata', Version(1, 7, 0)))
		54
50	AutoInstall.register(Package('atomicwrites', Version(1, 1, 5)))	55	AutoInstall.register(Package('atomicwrites', Version(1, 1, 5)))
51	AutoInstall.register(Package('attr', Version(18, 1, 0), pypi_name='attrs'))	56	AutoInstall.register(Package('attr', Version(18, 1, 0), pypi_name='attrs'))
52	AutoInstall.register(Package('bs4', Version(4, 9, 3), pypi_name='beautifulsoup4'))	57	AutoInstall.register(Package('bs4', Version(4, 9, 3), pypi_name='beautifulsoup4'))
Lines 54-60 AutoInstall.register(Package('configparser', Version(4, 0, 2))) a/Tools/Scripts/webkitpy/__init__.py_sec2
54	AutoInstall.register(Package('contextlib2', Version(0, 6, 0)))	59	AutoInstall.register(Package('contextlib2', Version(0, 6, 0)))
55	AutoInstall.register(Package('coverage', Version(5, 2, 1)))	60	AutoInstall.register(Package('coverage', Version(5, 2, 1)))
56	AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))	61	AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
57	AutoInstall.register(Package('importlib_metadata', Version(1, 7, 0)))
58	AutoInstall.register(Package('genshi', Version(0, 7, 3), pypi_name='Genshi'))	62	AutoInstall.register(Package('genshi', Version(0, 7, 3), pypi_name='Genshi'))
59	AutoInstall.register(Package('html5lib', Version(1, 1)))	63	AutoInstall.register(Package('html5lib', Version(1, 1)))
60	AutoInstall.register(Package('iniconfig', Version(1, 1, 1)))	64	AutoInstall.register(Package('iniconfig', Version(1, 1, 1)))



from webkitpy.common.system.executive import Executive, ScriptError
from webkitpy.common.system.user import User

import keyring
    try:
        import keyring
    except ImportError:
        keyring = None

_log = logging.getLogger(__name__)


        if username and not password and self._keyring and use_stored_credentials:
            try:
                password = self._keyring.get_password(self.host, username)
            except Exception as e:
                print('Oh no, got exception from keyring.getpassword!', str(e))

        if not password:
            password = user.prompt_password("%s password for %s: " % (self.host, username))



2021-10-07  Michael Catanzaro  <mcatanzaro@gnome.org>

        webkitpy keyring test bug
        https://bugs.webkit.org/show_bug.cgi?id=231381

        Reviewed by NOBODY (OOPS!).

        * Source/Makefile:

2021-10-07  Carlos Garcia Campos  <cgarcia@igalia.com>

        [GTK] Reenable -fvisibility=hidden

Return to Bug 231381

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +14 lines
		1	2021-10-07 Michael Catanzaro <mcatanzaro@gnome.org>
		2
		3	webkitpy keyring test bug
		4	https://bugs.webkit.org/show_bug.cgi?id=231381
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py:
		9	* Scripts/webkitpy/autoinstalled/__init__.py: Removed.
		10	* Scripts/webkitpy/autoinstalled/buildbot.py: Removed.
		11	* Scripts/webkitpy/autoinstalled/chromedriver.py: Removed.
		12	* Scripts/webkitpy/autoinstalled/geckodriver.py: Removed.
		13	* Scripts/webkitpy/autoinstalled/twisted.py: Removed.
		14
1	2021-10-08 Carlos Garcia Campos <cgarcia@igalia.com>	15	2021-10-08 Carlos Garcia Campos <cgarcia@igalia.com>
2		16
3	[WebDriver] Update w3c and selenium tests	17	[WebDriver] Update w3c and selenium tests

Lines 43-49 from webkitcorepy.call_by_need import CallByNeed a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py_sec1
- a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py -5 / +8 lines
43	from webkitcorepy.editor import Editor	43	from webkitcorepy.editor import Editor
44	from webkitcorepy.file_lock import FileLock	44	from webkitcorepy.file_lock import FileLock
45		45
46	version = Version(0, 11, 1)	46	version = Version(0, 11, 2)
47		47
48	from webkitcorepy.autoinstall import Package, AutoInstall	48	from webkitcorepy.autoinstall import Package, AutoInstall
49	if sys.version_info > (3, 0):	49	if sys.version_info > (3, 0):
Lines 61-67 AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dat a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py_sec2
61	AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))	61	AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))
62	AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))	62	AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
63	AutoInstall.register(Package('idna', Version(2, 10)))	63	AutoInstall.register(Package('idna', Version(2, 10)))
64	AutoInstall.register(Package('keyring', Version(7, 3, 1)))
65	AutoInstall.register(Package('packaging', Version(20, 4)))	64	AutoInstall.register(Package('packaging', Version(20, 4)))
66	AutoInstall.register(Package('pyparsing', Version(2, 4, 7)))	65	AutoInstall.register(Package('pyparsing', Version(2, 4, 7)))
67	AutoInstall.register(Package('requests', Version(2, 24)))	66	AutoInstall.register(Package('requests', Version(2, 24)))
Lines 73-80 AutoInstall.register(Package('urllib3', Version(1, 25, 10))) a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py_sec3
73	AutoInstall.register(Package('wheel', Version(0, 35, 1)))	72	AutoInstall.register(Package('wheel', Version(0, 35, 1)))
74	AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))	73	AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))
75		74
76	# This is needed for python-keyring.	75	if sys.version_info > (3, 6):
77	if sys.platform == 'linux':	76	keyring_deps = []
78	AutoInstall.register(Package('secretstorage', Version(2, 3, 1)))	77	if sys.platform == 'linux':
		78	AutoInstall.register(Package('jeepney', Version(0, 7, 1)))
		79	AutoInstall.register(Package('secretstorage', Version(3, 3, 1)))
		80	keyring_deps = ['secretstorage']
		81	AutoInstall.register(Package('keyring', Version(23, 2, 1), implicit_deps=keyring_deps))
79		82
80	name = 'webkitcorepy'	83	name = 'webkitcorepy'

Lines 40-50 from webkitpy.common.checkout.scm import Git a/Tools/Scripts/webkitpy/common/net/credentials.py_sec1
- a/Tools/Scripts/webkitpy/common/net/credentials.py -7 / +3 lines
40	from webkitpy.common.system.executive import Executive, ScriptError	40	from webkitpy.common.system.executive import Executive, ScriptError
41	from webkitpy.common.system.user import User	41	from webkitpy.common.system.user import User
42		42
43	with OutputCapture():	43	import keyring
44	try:
45	import keyring
46	except ImportError:
47	keyring = None
48		44
49	_log = logging.getLogger(__name__)	45	_log = logging.getLogger(__name__)
50		46
Lines 164-171 class Credentials(object): a/Tools/Scripts/webkitpy/common/net/credentials.py_sec2
164	if username and not password and self._keyring and use_stored_credentials:	160	if username and not password and self._keyring and use_stored_credentials:
165	try:	161	try:
166	password = self._keyring.get_password(self.host, username)	162	password = self._keyring.get_password(self.host, username)
167	except:	163	except Exception as e:
168	pass	164	print('Oh no, got exception from keyring.getpassword!', str(e))
169		165
170	if not password:	166	if not password:
171	password = user.prompt_password("%s password for %s: " % (self.host, username))	167	password = user.prompt_password("%s password for %s: " % (self.host, username))

Lines 1-3 a/ChangeLog_sec1
- a/ChangeLog +9 lines
		1	2021-10-07 Michael Catanzaro <mcatanzaro@gnome.org>
		2
		3	webkitpy keyring test bug
		4	https://bugs.webkit.org/show_bug.cgi?id=231381
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Source/Makefile:
		9
1	2021-10-07 Carlos Garcia Campos <cgarcia@igalia.com>	10	2021-10-07 Carlos Garcia Campos <cgarcia@igalia.com>
2		11
3	[GTK] Reenable -fvisibility=hidden	12	[GTK] Reenable -fvisibility=hidden