Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of no longer needed code

Browse Source
This commit is contained in:
Kovid Goyal 2022-04-27 18:05:09 +05:30
parent d441eb32b5
commit d52bb3646a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/calibre/gui2/__init__.py
View File

@ -538,26 +538,6 @@ def is_widescreen():
return _is_widescreen return _is_widescreen
def disable_webengine_sandbox_if_needed():
# See https://sourceware.org/glibc/wiki/Glibc%20Timeline
if not isfrozen or iswindows or ismacos or QT_VERSION >= 0x60000:
return
import ctypes
libc = ctypes.CDLL(None)
try:
f = libc.gnu_get_libc_version
except AttributeError:
return
f.restype = ctypes.c_char_p
ver = f().decode('ascii')
q = tuple(map(int, ver.split('.')))
if q >= (2, 34):
setattr(disable_webengine_sandbox_if_needed, 'done', True)
setattr(disable_webengine_sandbox_if_needed, 'orig_val', os.environ.get('QTWEBENGINE_DISABLE_SANDBOX'))
print('Disabling Qt WebEngine sandbox as version of glibc on this system will break it', file=sys.stderr)
os.environ['QTWEBENGINE_DISABLE_SANDBOX'] = '1'
def extension(path): def extension(path):
return os.path.splitext(path)[1][1:].lower() return os.path.splitext(path)[1][1:].lower()
@ -1047,7 +1027,6 @@ class Application(QApplication):
def __init__(self, args, force_calibre_style=False, override_program_name=None, headless=False, color_prefs=gprefs, windows_app_uid=None): def __init__(self, args, force_calibre_style=False, override_program_name=None, headless=False, color_prefs=gprefs, windows_app_uid=None):
self.ignore_palette_changes = False self.ignore_palette_changes = False
disable_webengine_sandbox_if_needed()
QNetworkProxyFactory.setUseSystemConfiguration(True) QNetworkProxyFactory.setUseSystemConfiguration(True)
# Allow import of webengine after construction of QApplication on new # Allow import of webengine after construction of QApplication on new
# enough PyQt # enough PyQt
@ -1441,8 +1420,6 @@ def sanitize_env_vars():
else: else:
env_vars = {} env_vars = {}
if getattr(disable_webengine_sandbox_if_needed, 'done', False):
env_vars['QTWEBENGINE_DISABLE_SANDBOX'] = None
originals = {x:os.environ.get(x, '') for x in env_vars} originals = {x:os.environ.get(x, '') for x in env_vars}
changed = {x:False for x in env_vars} changed = {x:False for x in env_vars}
for var, suffix in iteritems(env_vars): for var, suffix in iteritems(env_vars):
@ -1455,8 +1432,6 @@ def sanitize_env_vars():
del os.environ[var] del os.environ[var]
changed[var] = True changed[var] = True
if getattr(disable_webengine_sandbox_if_needed, 'orig_val', False):
os.environ['QTWEBENGINE_DISABLE_SANDBOX'] = disable_webengine_sandbox_if_needed.orig_val
try: try:
yield yield
finally: finally:
@ -1531,7 +1506,6 @@ def ensure_app(headless=True):
os.environ['QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM'] = '1' os.environ['QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM'] = '1'
if headless and iswindows: if headless and iswindows:
QApplication.setAttribute(Qt.ApplicationAttribute.AA_UseSoftwareOpenGL, True) QApplication.setAttribute(Qt.ApplicationAttribute.AA_UseSoftwareOpenGL, True)
disable_webengine_sandbox_if_needed()
_store_app = QApplication(args) _store_app = QApplication(args)
if headless and has_headless: if headless and has_headless:
_store_app.headless = True _store_app.headless = True