From b677d2985bf2b1c1b450858193f71b9caa040859 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 16 May 2012 15:38:26 -0400 Subject: [PATCH] -remove useless to utf8 conversions --- .../media-monitor/airtimefilemonitor/airtimenotifier.py | 8 ++++---- python_apps/media-monitor/media_monitor.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py index c6586efc5..6f6040db3 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py @@ -77,7 +77,7 @@ class AirtimeNotifier(Notifier): self.watch_directory(m['directory']) elif m['event_type'] == "remove_watch": - watched_directory = api_client.encode_to(m['directory'], 'utf-8') + watched_directory = m['directory'] mm = self.proc_fun() wd = mm.wm.get_wd(watched_directory) @@ -86,8 +86,8 @@ class AirtimeNotifier(Notifier): elif m['event_type'] == "change_stor": storage_directory = self.config.storage_directory - new_storage_directory = api_client.encode_to(m['directory'], 'utf-8') - new_storage_directory_id = api_client.encode_to(str(m['dir_id']), 'utf-8') + new_storage_directory = m['directory'] + new_storage_directory_id = str(m['dir_id']) mm = self.proc_fun() @@ -111,7 +111,7 @@ class AirtimeNotifier(Notifier): self.watch_directory(new_storage_directory) elif m['event_type'] == "file_delete": - filepath = api_client.encode_to(m['filepath'], 'utf-8') + filepath = m['filepath'] mm = self.proc_fun() self.logger.info("Adding file to ignore: %s ", filepath) diff --git a/python_apps/media-monitor/media_monitor.py b/python_apps/media-monitor/media_monitor.py index 7522ecdcc..f9f19a5de 100644 --- a/python_apps/media-monitor/media_monitor.py +++ b/python_apps/media-monitor/media_monitor.py @@ -91,8 +91,8 @@ try: response = api_client.setup_media_monitor() time.sleep(5) - storage_directory = apc.encode_to(response["stor"], 'utf-8') - watched_dirs = apc.encode_to(response["watched_dirs"], 'utf-8') + storage_directory = response["stor"] + watched_dirs = response["watched_dirs"] logger.info("Storage Directory is: %s", storage_directory) config.storage_directory = os.path.normpath(storage_directory) config.imported_directory = os.path.normpath(os.path.join(storage_directory, 'imported'))