This is an archive of the discontinued LLVM Phabricator instance.

Differential D55205

Python 2/3 compat - commands
ClosedPublic

Authored by serge-sans-paille on Dec 3 2018, 2:48 AM.

Details

Reviewers
joerg
michaelplatings
Commits
rG3ee1ffc9fcb0: Portable Python script across Python version
rL349503: Portable Python script across Python version
rC349503: Portable Python script across Python version

Diff Detail

Repository
rC Clang

Event Timeline

serge-sans-paille created this revision.Dec 3 2018, 2:48 AM
Herald added subscribers: kadircet, arphaman. · View Herald TranscriptDec 3 2018, 2:48 AM
michaelplatings added inline comments.Dec 13 2018, 2:02 AM
tools/scan-view/share/startfile.py
115

except ImportError:

serge-sans-paille updated this revision to Diff 178618.Dec 18 2018, 1:04 AM
serge-sans-paille marked an inline comment as done.
michaelplatings accepted this revision.Dec 18 2018, 2:04 AM

LGTM

This revision is now accepted and ready to land.Dec 18 2018, 2:04 AM
Closed by commit rC349503: Portable Python script across Python version (authored by serge_sans_paille). · Explain WhyDec 18 2018, 8:10 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: cfe-commits. · View Herald TranscriptDec 18 2018, 8:10 AM

Revision Contents

PathSize
tools/
scan-view/
share/
9 lines
utils/
1 line

Diff 178683

tools/scan-view/share/startfile.py

Show First 20 Lines • Show All 104 Lines • ▼ Show 20 Lines
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
_controllers['open']= Controller('open') _controllers['open']= Controller('open')
_open = _controllers['open'].open _open = _controllers['open'].open
# Platform support for Unix # Platform support for Unix
else: else:
import commands try:
from commands import getoutput
except ImportError:
michaelplatingsUnsubmitted
Done
ReplyInline Actions

except ImportError:

michaelplatings: except ImportError:
from subprocess import getoutput
# @WARNING: use the private API of the webbrowser module # @WARNING: use the private API of the webbrowser module
from webbrowser import _iscommand from webbrowser import _iscommand
class KfmClient(Controller): class KfmClient(Controller):
'''Controller for the KDE kfmclient program.''' '''Controller for the KDE kfmclient program.'''
def __init__(self, kfmclient='kfmclient'): def __init__(self, kfmclient='kfmclient'):
super(KfmClient, self).__init__(kfmclient, 'exec') super(KfmClient, self).__init__(kfmclient, 'exec')
self.kde_version = self.detect_kde_version() self.kde_version = self.detect_kde_version()
def detect_kde_version(self): def detect_kde_version(self):
kde_version = None kde_version = None
try: try:
info = commands.getoutput('kde-config --version') info = getoutput('kde-config --version')
for line in info.splitlines(): for line in info.splitlines():
if line.startswith('KDE'): if line.startswith('KDE'):
kde_version = line.split(':')[-1].strip() kde_version = line.split(':')[-1].strip()
break break
except (OSError, RuntimeError): except (OSError, RuntimeError):
pass pass
Show All 16 Lines def detect_desktop_environment():
desktop_environment = 'generic' desktop_environment = 'generic'
if os.environ.get('KDE_FULL_SESSION') == 'true': if os.environ.get('KDE_FULL_SESSION') == 'true':
desktop_environment = 'kde' desktop_environment = 'kde'
elif os.environ.get('GNOME_DESKTOP_SESSION_ID'): elif os.environ.get('GNOME_DESKTOP_SESSION_ID'):
desktop_environment = 'gnome' desktop_environment = 'gnome'
else: else:
try: try:
info = commands.getoutput('xprop -root _DT_SAVE_MODE') info = getoutput('xprop -root _DT_SAVE_MODE')
if ' = "xfce4"' in info: if ' = "xfce4"' in info:
desktop_environment = 'xfce' desktop_environment = 'xfce'
except (OSError, RuntimeError): except (OSError, RuntimeError):
pass pass
return desktop_environment return desktop_environment
Show All 37 Lines

utils/clangdiag.py

#!/usr/bin/python #!/usr/bin/python
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Be sure to add the python path that points to the LLDB shared library. # Be sure to add the python path that points to the LLDB shared library.
# #
# # To use this in the embedded python interpreter using "lldb" just # # To use this in the embedded python interpreter using "lldb" just
# import it with the full path using the "command script import" # import it with the full path using the "command script import"
# command # command
# (lldb) command script import /path/to/clandiag.py # (lldb) command script import /path/to/clandiag.py
#---------------------------------------------------------------------- #----------------------------------------------------------------------
from __future__ import print_function from __future__ import print_function
import lldb import lldb
import argparse import argparse
import commands
import shlex import shlex
import os import os
import re import re
import subprocess import subprocess
class MyParser(argparse.ArgumentParser): class MyParser(argparse.ArgumentParser):
def format_help(self): def format_help(self):
return ''' Commands for managing clang diagnostic breakpoints return ''' Commands for managing clang diagnostic breakpoints
▲ Show 20 Lines • Show All 170 Lines • Show Last 20 Lines