Änderungen für Python2.7

chriszero · Sep 1, 2013 · 53083f4 · 53083f4
1 parent 44df601
commit 53083f4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/tvsp2xmltv/defaults.py b/tvsp2xmltv/defaults.py
@@ -3,7 +3,7 @@
 import operator
 import os
 import stat
-import configparser
+import ConfigParser
 
 # ugo+rw because may different user work with this file
 file_mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP | stat.S_IROTH | stat.S_IWOTH
@@ -21,16 +21,16 @@ def find_in_path(file_name, path=None):
     return file_name
 
 
-config = configparser.ConfigParser()
+config = ConfigParser.ConfigParser()
 config.read(find_in_path('tvspielfilm2xmltv.ini'))
 
-destination_file = config['DEFAULT']['destination_file']
-control_file = config['DEFAULT']['control_file']
-epgimages_dir = config['DEFAULT']['epgimages_dir']
-remove_orphaned_images = config['DEFAULT'].getboolean('remove_orphaned_images')
-grab_today = config['DEFAULT'].getboolean('grab_today')
-number_of_images_per_show = int(config['DEFAULT']['number_of_images_per_show'])
-debug = config['DEFAULT'].getboolean('debug')
+destination_file = config.get('DEFAULT', 'destination_file')
+control_file = config.get('DEFAULT', 'control_file')
+epgimages_dir = config.get('DEFAULT', 'epgimages_dir')
+remove_orphaned_images = config.getboolean('DEFAULT', 'remove_orphaned_images')
+grab_today = config.getboolean('DEFAULT', 'grab_today')
+number_of_images_per_show = config.getint('DEFAULT', 'number_of_images_per_show')
+debug = config.getboolean('DEFAULT', 'debug')
 
 sart_map = {
 'SE': 'Serie',

diff --git a/tvsp2xmltv/pictureLoader.py b/tvsp2xmltv/pictureLoader.py
@@ -4,7 +4,7 @@
 import glob
 from io import open
 from os import path, remove, fchmod
-from urllib.parse import urlsplit
+import urllib
 from . import defaults
 from . import logger
 from xml.etree.ElementTree import Element
@@ -43,7 +43,7 @@ def get_xml(self):
 
     def __download_image(self, file_url, file_dir):
         suffix_list = ['jpg', 'gif', 'png']
-        file_name = urlsplit(file_url)[2].split('/')[-1]
+        file_name = urllib.parse.split(file_url)[2].split('/')[-1]
         file_suffix = file_name.split('.')[1]
         full_file_path = path.abspath(path.join(file_dir, file_name))
         #check if file exists before downloading it again