From fcc6e942ab221ca2bda36f936fdf64637e41f298 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 7 Mar 2020 08:36:30 -0500 Subject: [PATCH] Use correct xml library for kodi --- jellyfin_kodi/helper/xmls.py | 8 ++++---- jellyfin_kodi/views.py | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jellyfin_kodi/helper/xmls.py b/jellyfin_kodi/helper/xmls.py index 015a6ca1..a1bfe873 100644 --- a/jellyfin_kodi/helper/xmls.py +++ b/jellyfin_kodi/helper/xmls.py @@ -5,7 +5,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera import logging import os -from lxml import etree +import xml.etree.ElementTree as etree from kodi_six import xbmc @@ -76,7 +76,7 @@ def sources(): LOG.exception(error) tree = etree.ElementTree(xml) - tree.write(file, pretty_print=True) + tree.write(file) def tvtunes_nfo(path, urls): @@ -96,7 +96,7 @@ def tvtunes_nfo(path, urls): etree.SubElement(xml, 'file').text = url tree = etree.ElementTree(xml) - tree.write(path, pretty_print=True) + tree.write(path) def advanced_settings(): @@ -126,7 +126,7 @@ def advanced_settings(): video.remove(cleanonupdate) tree = etree.ElementTree(xml) - tree.write(path, pretty_print=True) + tree.write(path) dialog("ok", heading="{jellyfin}", line1=translate(33097)) xbmc.executebuiltin('RestartApp') diff --git a/jellyfin_kodi/views.py b/jellyfin_kodi/views.py index b36557b0..5ccfab35 100644 --- a/jellyfin_kodi/views.py +++ b/jellyfin_kodi/views.py @@ -6,7 +6,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera import logging import os import shutil -from lxml import etree +import xml.etree.ElementTree as etree from six.moves.urllib.parse import urlencode from kodi_six import xbmc, xbmcvfs @@ -127,7 +127,7 @@ def verify_kodi_defaults(): xml = etree.parse(file).getroot() xml.set('order', str(17 + index)) tree = etree.ElementTree(xml) - tree.write(file, pretty_print=True) + tree.write(file) playlist_path = xbmc.translatePath("special://profile/playlists/video") @@ -298,7 +298,7 @@ class Views(object): etree.SubElement(rule, 'value').text = view['Tag'] tree = etree.ElementTree(xml) - tree.write(file, pretty_print=True) + tree.write(file) def add_nodes(self, path, view, mixed=False): @@ -360,7 +360,7 @@ class Views(object): self.node_all(xml) tree = etree.ElementTree(xml) - tree.write(file, pretty_print=True) + tree.write(file) def node_root(self, root, index): @@ -400,7 +400,7 @@ class Views(object): label.text = view['Name'] if not mixed else "%s (%s)" % (view['Name'], translate(view['Media'])) tree = etree.ElementTree(xml) - tree.write(file, pretty_print=True) + tree.write(file) def node(self, folder, view): @@ -462,7 +462,7 @@ class Views(object): getattr(self, 'node_' + node)(xml) # get node function based on node type tree = etree.ElementTree(xml) - tree.write(file, pretty_print=True) + tree.write(file) def add_dynamic_node(self, index, file, view, node, name, path): @@ -484,7 +484,7 @@ class Views(object): getattr(self, 'node_' + node)(xml, path) tree = etree.ElementTree(xml) - tree.write(file, pretty_print=True) + tree.write(file) def node_all(self, root):