mirror of https://github.com/python/cpython
bpo-43424: Deprecate `webbrowser.MacOSXOSAScript._name` attribute (GH-30241)
This commit is contained in:
parent
8e11237c5d
commit
d12bec6993
|
@ -197,6 +197,11 @@ Browser controllers provide these methods which parallel three of the
|
|||
module-level convenience functions:
|
||||
|
||||
|
||||
.. attribute:: name
|
||||
|
||||
System-dependent name for the browser.
|
||||
|
||||
|
||||
.. method:: controller.open(url, new=0, autoraise=True)
|
||||
|
||||
Display *url* using the browser handled by this controller. If *new* is 1, a new
|
||||
|
|
|
@ -304,7 +304,7 @@ class ImportTest(unittest.TestCase):
|
|||
webbrowser = import_helper.import_fresh_module('webbrowser')
|
||||
try:
|
||||
browser = webbrowser.get().name
|
||||
except (webbrowser.Error, AttributeError) as err:
|
||||
except webbrowser.Error as err:
|
||||
self.skipTest(str(err))
|
||||
with os_helper.EnvironmentVarGuard() as env:
|
||||
env["BROWSER"] = browser
|
||||
|
@ -316,7 +316,7 @@ class ImportTest(unittest.TestCase):
|
|||
try:
|
||||
webbrowser.get()
|
||||
least_preferred_browser = webbrowser.get(webbrowser._tryorder[-1]).name
|
||||
except (webbrowser.Error, AttributeError, IndexError) as err:
|
||||
except (webbrowser.Error, IndexError) as err:
|
||||
self.skipTest(str(err))
|
||||
|
||||
with os_helper.EnvironmentVarGuard() as env:
|
||||
|
|
|
@ -666,19 +666,33 @@ if sys.platform == 'darwin':
|
|||
return not rc
|
||||
|
||||
class MacOSXOSAScript(BaseBrowser):
|
||||
def __init__(self, name):
|
||||
self._name = name
|
||||
def __init__(self, name='default'):
|
||||
super().__init__(name)
|
||||
|
||||
@property
|
||||
def _name(self):
|
||||
warnings.warn(f'{self.__class__.__name__}._name is deprecated in 3.11'
|
||||
f' use {self.__class__.__name__}.name instead.',
|
||||
DeprecationWarning, stacklevel=2)
|
||||
return self.name
|
||||
|
||||
@_name.setter
|
||||
def _name(self, val):
|
||||
warnings.warn(f'{self.__class__.__name__}._name is deprecated in 3.11'
|
||||
f' use {self.__class__.__name__}.name instead.',
|
||||
DeprecationWarning, stacklevel=2)
|
||||
self.name = val
|
||||
|
||||
def open(self, url, new=0, autoraise=True):
|
||||
if self._name == 'default':
|
||||
if self.name == 'default':
|
||||
script = 'open location "%s"' % url.replace('"', '%22') # opens in default browser
|
||||
else:
|
||||
script = '''
|
||||
script = f'''
|
||||
tell application "%s"
|
||||
activate
|
||||
open location "%s"
|
||||
end
|
||||
'''%(self._name, url.replace('"', '%22'))
|
||||
'''%(self.name, url.replace('"', '%22'))
|
||||
|
||||
osapipe = os.popen("osascript", "w")
|
||||
if osapipe is None:
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Deprecate :attr:`webbrowser.MacOSXOSAScript._name` and use ``name`` instead.
|
Loading…
Reference in New Issue