From feb01b748ffba24a8143f7ada0ce803377d18c95 Mon Sep 17 00:00:00 2001 From: tomkat83 Date: Wed, 23 Mar 2016 09:42:59 +0100 Subject: [PATCH] Switch from xml.etree.cElementTree to .ElementTree cElementTree has issues, e.g. during Kodi user profile switch --- resources/lib/PlexAPI.py | 5 +---- resources/lib/downloadutils.py | 5 +---- resources/lib/librarysync.py | 5 +---- service.py | 5 ++++- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/resources/lib/PlexAPI.py b/resources/lib/PlexAPI.py index bc01e714..50655623 100644 --- a/resources/lib/PlexAPI.py +++ b/resources/lib/PlexAPI.py @@ -58,10 +58,7 @@ from urllib import urlencode, quote_plus, unquote from PlexFunctions import PlexToKodiTimefactor, PMSHttpsEnabled -try: - import xml.etree.cElementTree as etree -except ImportError: - import xml.etree.ElementTree as etree +import xml.etree.ElementTree as etree @utils.logging diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py index d7e1b387..0deb07d6 100644 --- a/resources/lib/downloadutils.py +++ b/resources/lib/downloadutils.py @@ -4,6 +4,7 @@ # import json import requests +import xml.etree.ElementTree as etree # import logging # import xbmc @@ -13,10 +14,6 @@ import utils import clientinfo import PlexAPI -try: - import xml.etree.cElementTree as etree -except ImportError: - import xml.etree.ElementTree as etree ############################################################################### diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py index 591f9041..1dc0cddd 100644 --- a/resources/lib/librarysync.py +++ b/resources/lib/librarysync.py @@ -4,10 +4,7 @@ from threading import Thread, Lock import Queue -try: - import xml.etree.cElementTree as etree -except ImportError: - import xml.etree.ElementTree as etree +import xml.etree.ElementTree as etree import xbmc import xbmcgui diff --git a/service.py b/service.py index bb561ed6..b69a5df0 100644 --- a/service.py +++ b/service.py @@ -79,7 +79,10 @@ class Service(): "emby_initialScan", "emby_customplaylist", "emby_playbackProps", "plex_runLibScan", "plex_username", "pms_token", "plex_token", "pms_server", "plex_machineIdentifier", "plex_servername", - "plex_authenticated" + "plex_authenticated", "EmbyUserImage", "useDirectPaths", + "replaceSMB", "remapSMB", "remapSMBmovieOrg", "remapSMBtvOrg", + "remapSMBmusicOrg", "remapSMBmovieNew", "remapSMBtvNew", + "remapSMBmusicNew", "suspend_LibraryThread" ] for prop in properties: window(prop, clear=True)