From 120612c8bd74040dd624f25e359f30a257d180e6 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Tue, 19 Nov 2013 17:57:14 +0200
Subject: [PATCH] Clean up unused variables. Some whitespace edits.
---
render_renderfarmfi/utils.py | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/render_renderfarmfi/utils.py b/render_renderfarmfi/utils.py
index ae905383b..8afcfd78b 100644
--- a/render_renderfarmfi/utils.py
+++ b/render_renderfarmfi/utils.py
@@ -38,7 +38,7 @@ def _read_credentials():
pwfile = bpy.utils.user_resource('CONFIG', 'rffi', True)
try:
pwmod = imp.find_module('rffi_credentials',[pwfile])
- except ImportError as e:
+ except ImportError:
_write_credentials('', '')
pwmod = imp.find_module('rffi_credentials',[pwfile])
try:
@@ -46,7 +46,7 @@ def _read_credentials():
bpy.rffi_user = user_creds.user
bpy.rffi_hash = user_creds.hash
bpy.rffi_creds_found = True
- except ImportError as e:
+ except ImportError:
# doesn't exist yet, write template
_write_credentials('', '')
pwfile = bpy.utils.user_resource('CONFIG', 'rffi', True)
@@ -82,15 +82,13 @@ def _xmlsessions_to_oresessions(sessions, stage=None):
def update_session_list(session_list, ore):
while(len(session_list) > 0):
session_list.remove(0)
-
+
for s in bpy.ore_active_session_queue:
session_list.add()
session = session_list[-1]
session.name = s.title + ' [' + str(s.percentageComplete()) + '% complete]'
def update_complete_session_list(ore):
- all_sessions = []
-
bpy.ore_active_session_queue = bpy.ore_cancelled_sessions
update_session_list(ore.rejected_sessions, ore)
bpy.ore_active_session_queue = bpy.ore_active_sessions
@@ -99,29 +97,29 @@ def update_complete_session_list(ore):
update_session_list(ore.pending_sessions, ore)
bpy.ore_active_session_queue = bpy.ore_completed_sessions
update_session_list(ore.completed_sessions, ore)
-
+
bpy.ore_complete_session_queue = []
bpy.ore_complete_session_queue.extend(bpy.ore_pending_sessions)
bpy.ore_complete_session_queue.extend(bpy.ore_active_sessions)
bpy.ore_complete_session_queue.extend(bpy.ore_completed_sessions)
bpy.ore_complete_session_queue.extend(bpy.ore_cancelled_sessions)
-
+
bpy.ore_active_session_queue = bpy.ore_complete_session_queue
update_session_list(ore.all_sessions, ore)
def check_status(ore):
bpy.errors = []
-
+
if bpy.rffi_creds_found == False and bpy.rffi_hash == '':
bpy.errors.append('missing_creds')
-
+
if '' in {ore.title, ore.longdesc, ore.shortdesc}:
bpy.errors.append('missing_desc')
bpy.infoError = True
set_status('username', bpy.rffi_hash=='' and ore.username=='')
set_status('password', bpy.rffi_hash=='' and ore.password=='')
-
+
set_status('title', ore.title=='')
set_status('longdesc', ore.longdesc=='')
set_status('shortdesc', ore.shortdesc=='')
--
GitLab