diff --git a/ADDITIONAL-LICENSES b/ADDITIONAL-LICENSES index 9bf7547d..f6a4a8f8 100644 --- a/ADDITIONAL-LICENSES +++ b/ADDITIONAL-LICENSES @@ -11,4 +11,4 @@ lib/jsonencoder.py is licensed under PSFL, https://www.python.org/download/relea scripts/gamecontrollerdb.txt is taken from Simple DirectMedia Layer library and licensed under zlib license. lib/xwrappers.py and lib/vdf.py are part of SC-Controller, licensed under GPL2 as rest of the project. -Everything else is licensed under GPL2, as described in 'LICENCE' file. +Everything else is licensed under GPL2, as described in 'LICENSE' file. diff --git a/images/menu-icons/buttons/LICENCES b/images/menu-icons/buttons/LICENSES similarity index 100% rename from images/menu-icons/buttons/LICENCES rename to images/menu-icons/buttons/LICENSES diff --git a/images/menu-icons/driving/LICENCES b/images/menu-icons/driving/LICENSES similarity index 100% rename from images/menu-icons/driving/LICENCES rename to images/menu-icons/driving/LICENSES diff --git a/images/menu-icons/items/LICENCES b/images/menu-icons/items/LICENSES similarity index 100% rename from images/menu-icons/items/LICENCES rename to images/menu-icons/items/LICENSES diff --git a/images/menu-icons/media/LICENCES b/images/menu-icons/media/LICENSES similarity index 100% rename from images/menu-icons/media/LICENCES rename to images/menu-icons/media/LICENSES diff --git a/images/menu-icons/system/LICENCES b/images/menu-icons/system/LICENSES similarity index 100% rename from images/menu-icons/system/LICENCES rename to images/menu-icons/system/LICENSES diff --git a/images/menu-icons/weapons/LICENCES b/images/menu-icons/weapons/LICENSES similarity index 100% rename from images/menu-icons/weapons/LICENCES rename to images/menu-icons/weapons/LICENSES diff --git a/scc/gui/icon_chooser.py b/scc/gui/icon_chooser.py index 41174f19..982f3742 100644 --- a/scc/gui/icon_chooser.py +++ b/scc/gui/icon_chooser.py @@ -10,7 +10,10 @@ from scc.gui.editor import Editor from scc.paths import get_menuicons_path from scc.tools import find_icon -import os, traceback, logging, re +import os +import traceback +import logging +import re log = logging.getLogger("IconChooser") RE_URL = re.compile(r"(.*)(https?://[^ ]+)(.*)") DEFAULT_ICON_CATEGORIES = ( "items", "media", "weapons", "system" ) @@ -47,7 +50,7 @@ def on_btUserFolder_activate_link(self, *a): for c in DEFAULT_ICON_CATEGORIES: try: os.makedirs(os.path.join(get_menuicons_path(), c)) - except: + except Exception: # Dir. exists pass @@ -163,13 +166,14 @@ def on_menuicons_loaded(self, icons): # Try to select 1st category, but ignore if that fails tvCategories.get_selection().select_path(( 0, )) self.on_tvCategories_cursor_changed(tvCategories) - except: pass + except Exception: + pass @staticmethod def find_license(path, name): """ Parses LICENSE file, if any, and returns license for give file """ - licensefile = os.path.join(path, "LICENCES") + licensefile = os.path.join(path, "LICENSES") if not os.path.exists(licensefile): return None for line in open(licensefile, "r").readlines(): diff --git a/setup.py b/setup.py index 92f2efe4..e08af797 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ ] + [ # menu icons subfolders ( 'share/scc/images/menu-icons/' + x.split("/")[-1], - [ x + "/LICENCES" ] + glob.glob(x + "/*.png") + [ x + "/LICENSES" ] + glob.glob(x + "/*.png") ) for x in glob.glob("images/menu-icons/*") ] @@ -62,7 +62,7 @@ 'scripts/scc-osd-radial-menu', 'scripts/scc-osd-show-bindings', ], - license = 'GPL2', + license = 'GPL-2.0-only', platforms = ['Linux'], ext_modules = [ Extension('libuinput', sources = ['scc/uinput.c']),