ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make pep8.py happy

Browse Source
This commit is contained in:
Andy Kittner 2012-11-24 20:35:06 +01:00
parent 220abe45c3
commit 21a51523a4
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
openslides/main.py
View File

@ -73,12 +73,15 @@ _portable_db_path = object()
_fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding() _fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
def _fs2unicode(s): def _fs2unicode(s):
if isinstance(s, unicode): if isinstance(s, unicode):
return s return s
return s.decode(_fs_encoding) return s.decode(_fs_encoding)
def process_options(argv = None):
def process_options(argv=None):
if argv is None: if argv is None:
argv = sys.argv[1:] argv = sys.argv[1:]
@ -104,10 +107,12 @@ def process_options(argv = None):
return opts return opts
def main(argv=None): def main(argv=None):
opts = process_options(argv) opts = process_options(argv)
_main(opts) _main(opts)
def win32_portable_main(argv=None): def win32_portable_main(argv=None):
"""special entry point for the win32 portable version""" """special entry point for the win32 portable version"""
@ -127,12 +132,13 @@ def win32_portable_main(argv=None):
os.unlink(test_file) os.unlink(test_file)
if portable_dir_writeable: if portable_dir_writeable:
opts.settings = os.path.join(portable_dir, opts.settings = os.path.join(
"openslides", "settings.py") portable_dir, "openslides", "settings.py")
database_path = _portable_db_path database_path = _portable_db_path
_main(opts, database_path=database_path) _main(opts, database_path=database_path)
def _main(opts, database_path=None): def _main(opts, database_path=None):
# Find the path to the settings # Find the path to the settings
settings_path = opts.settings settings_path = opts.settings
@ -305,24 +311,28 @@ def start_browser(url):
t = threading.Thread(target=f) t = threading.Thread(target=f)
t.start() t.start()
def get_user_config_path(*args): def get_user_config_path(*args):
if sys.platform == "win32": if sys.platform == "win32":
return win32_get_app_data_path(*args) return win32_get_app_data_path(*args)
config_home = os.environ.get('XDG_CONFIG_HOME', \ config_home = os.environ.get(
os.path.join(os.path.expanduser('~'), '.config')) 'XDG_CONFIG_HOME', os.path.join(os.path.expanduser('~'), '.config'))
return os.path.join(_fs2unicode(config_home), *args) return os.path.join(_fs2unicode(config_home), *args)
def get_user_data_path(*args): def get_user_data_path(*args):
if sys.platform == "win32": if sys.platform == "win32":
return win32_get_app_data_path(*args) return win32_get_app_data_path(*args)
data_home = os.environ.get('XDG_DATA_HOME', \ data_home = os.environ.get(
os.path.join(os.path.expanduser('~'), '.local', 'share')) 'XDG_DATA_HOME', os.path.join(
os.path.expanduser('~'), '.local', 'share'))
return os.path.join(_fs2unicode(data_home), *args) return os.path.join(_fs2unicode(data_home), *args)
def get_portable_path(*args): def get_portable_path(*args):
# NOTE: sys.executable will be the path to openslides.exe # NOTE: sys.executable will be the path to openslides.exe
# since it is essentially a small wrapper that embeds the # since it is essentially a small wrapper that embeds the
@ -330,20 +340,24 @@ def get_portable_path(*args):
exename = os.path.basename(sys.executable).lower() exename = os.path.basename(sys.executable).lower()
if exename != "openslides.exe": if exename != "openslides.exe":
raise Exception("Cannot determine portable path when " raise Exception(
"Cannot determine portable path when "
"not running as portable") "not running as portable")
portable_dir = _fs2unicode(os.path.dirname(os.path.abspath(sys.executable))) portable_dir = _fs2unicode(os.path.dirname(os.path.abspath(sys.executable)))
return os.path.join(portable_dir, *args) return os.path.join(portable_dir, *args)
def get_portable_db_path(): def get_portable_db_path():
return get_portable_path('openslides', 'database.sqlite') return get_portable_path('openslides', 'database.sqlite')
def win32_get_app_data_path(*args): def win32_get_app_data_path(*args):
shell32 = ctypes.WinDLL("shell32.dll") shell32 = ctypes.WinDLL("shell32.dll")
SHGetFolderPath = shell32.SHGetFolderPathW SHGetFolderPath = shell32.SHGetFolderPathW
SHGetFolderPath.argtypes = (ctypes.c_void_p, ctypes.c_int, SHGetFolderPath.argtypes = (
ctypes.c_void_p, ctypes.c_uint32, ctypes.c_wchar_p) ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_uint32,
ctypes.c_wchar_p)
SHGetFolderPath.restype = ctypes.c_uint32 SHGetFolderPath.restype = ctypes.c_uint32
CSIDL_LOCAL_APPDATA = 0x001c CSIDL_LOCAL_APPDATA = 0x001c