From 2671becddeb19cac47383404bea5facf48f1bba9 Mon Sep 17 00:00:00 2001 From: labrys Date: Mon, 6 Jun 2016 03:44:32 -0400 Subject: [PATCH] Use six.text_type to standardize unicode function --- TorrentToMedia.py | 11 ++++++----- nzbToMedia.py | 12 +++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index 55138674..1d0d1f87 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -5,6 +5,7 @@ import os import sys import core +from libs.six import text_type from core import logger, nzbToMediaDB from core.nzbToMediaUtil import convert_to_ascii, CharReplace, plex_update from core.nzbToMediaUserScript import external_script @@ -31,11 +32,11 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID, except: pass - controlValueDict = {"input_directory": unicode(inputDirectory1)} - newValueDict = {"input_name": unicode(inputName1), - "input_hash": unicode(inputHash), - "input_id": unicode(inputID), - "client_agent": unicode(clientAgent), + controlValueDict = {"input_directory": text_type(inputDirectory1)} + newValueDict = {"input_name": text_type(inputName1), + "input_hash": text_type(inputHash), + "input_id": text_type(inputID), + "client_agent": text_type(clientAgent), "status": 0, "last_update": datetime.date.today().toordinal() } diff --git a/nzbToMedia.py b/nzbToMedia.py index 4997116b..7efa244f 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -502,6 +502,8 @@ import os import sys import datetime +from libs.six import text_type + import core from core.autoProcess.autoProcessComics import autoProcessComics from core.autoProcess.autoProcessGames import autoProcessGames @@ -539,11 +541,11 @@ def process(inputDirectory, inputName=None, status=0, clientAgent='manual', down except: pass - controlValueDict = {"input_directory": unicode(inputDirectory1)} - newValueDict = {"input_name": unicode(inputName1), - "input_hash": unicode(download_id), - "input_id": unicode(download_id), - "client_agent": unicode(clientAgent), + controlValueDict = {"input_directory": text_type(inputDirectory1)} + newValueDict = {"input_name": text_type(inputName1), + "input_hash": text_type(download_id), + "input_id": text_type(download_id), + "client_agent": text_type(clientAgent), "status": 0, "last_update": datetime.date.today().toordinal() }