cleanup

- remove/comment unused variables
- remove unused imports
- fixed some bugs using incorrect variables

11 files changed, 42 insertions, 37 deletions

diff --git a/netrender/client.py b/netrender/client.py
index 651b4660..26504884 100644
--- a/netrender/client.py
+++ b/netrender/client.py
@@ -17,9 +17,9 @@
 # ##### END GPL LICENSE BLOCK #####
 
 import bpy
-import sys, os, re
-import http, http.client, http.server, urllib
-import subprocess, shutil, time, hashlib
+import os, re
+import http, http.client, http.server
+import time
 import json
 
 import netrender
@@ -96,8 +96,8 @@ def fillCommonJobSettings(job, job_name, netsettings):
     job.name = job_name
     job.category = netsettings.job_category
 
-    for slave in netrender.blacklist:
-        job.blacklist.append(slave.id)
+    for bad_slave in netrender.blacklist:
+        job.blacklist.append(bad_slave.id)
 
     job.chunks = netsettings.chunks
     job.priority = netsettings.priority
diff --git a/netrender/master.py b/netrender/master.py
index 280a4019..0e406bc0 100644
--- a/netrender/master.py
+++ b/netrender/master.py
@@ -17,8 +17,8 @@
 # ##### END GPL LICENSE BLOCK #####
 
 import sys, os
-import http, http.client, http.server, urllib, socket, socketserver, threading
-import subprocess, shutil, time, hashlib
+import http, http.client, http.server, socket, socketserver
+import shutil, time, hashlib
 import pickle
 import select # for select.error
 import json
@@ -648,7 +648,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
         # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
         elif self.path == "/slave":
             length = int(self.headers['content-length'])
-            job_frame_string = self.headers['job-frame']
+            # job_frame_string = self.headers['job-frame']  # UNUSED
 
             self.server.stats("", "New slave connected")
 
diff --git a/netrender/master_html.py b/netrender/master_html.py
index da975184..7d46dd2a 100644
--- a/netrender/master_html.py
+++ b/netrender/master_html.py
@@ -17,7 +17,6 @@
 # ##### END GPL LICENSE BLOCK #####
 
 import os
-import re
 import shutil
 from netrender.utils import *
 import netrender.model
diff --git a/netrender/model.py b/netrender/model.py
index 5fc0bc2a..cab619f2 100644
--- a/netrender/model.py
+++ b/netrender/model.py
@@ -16,10 +16,6 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-import sys, os
-import http, http.client, http.server, urllib
-import subprocess, shutil, time, hashlib
-
 import netrender.versioning as versioning
 from netrender.utils import *
 
diff --git a/netrender/operators.py b/netrender/operators.py
index 563da1c5..718582fb 100644
--- a/netrender/operators.py
+++ b/netrender/operators.py
@@ -17,8 +17,8 @@
 # ##### END GPL LICENSE BLOCK #####
 
 import bpy
-import sys, os
-import http, http.client, http.server, urllib, socket
+import os
+import http, http.client, http.server
 import webbrowser
 import json
 
@@ -39,13 +39,13 @@ class RENDER_OT_netslave_bake(bpy.types.Operator):
 
     def execute(self, context):
         scene = context.scene
-        netsettings = scene.network_render
+        # netsettings = scene.network_render  # UNUSED
 
         filename = bpy.data.filepath
         path, name = os.path.split(filename)
         root, ext = os.path.splitext(name)
-        default_path = path + os.sep + "blendcache_" + root + os.sep # need an API call for that
-        relative_path = os.sep + os.sep + "blendcache_" + root + os.sep
+        # default_path = path + os.sep + "blendcache_" + root + os.sep # need an API call for that, UNUSED
+        relative_path = "//blendcache_" + root + os.sep
 
         # Force all point cache next to the blend file
         for object in bpy.data.objects:
@@ -410,7 +410,6 @@ class netclientdownload(bpy.types.Operator):
 
     def execute(self, context):
         netsettings = context.scene.network_render
-        rd = context.scene.render
 
         conn = clientConnection(netsettings.server_address, netsettings.server_port, self.report)
 
diff --git a/netrender/repath.py b/netrender/repath.py
index 3ac9636b..74692554 100644
--- a/netrender/repath.py
+++ b/netrender/repath.py
@@ -22,7 +22,6 @@ import subprocess
 import bpy
 
 from netrender.utils import *
-import netrender.model
 
 BLENDER_PATH = sys.argv[0]
 
diff --git a/netrender/slave.py b/netrender/slave.py
index 7f72530e..6fef4f4e 100644
--- a/netrender/slave.py
+++ b/netrender/slave.py
@@ -17,7 +17,7 @@
 # ##### END GPL LICENSE BLOCK #####
 
 import sys, os, platform, shutil
-import http, http.client, http.server, urllib
+import http, http.client, http.server
 import subprocess, time
 import json
 
@@ -121,7 +121,7 @@ def breakable_timeout(timeout):
             break
 
 def render_slave(engine, netsettings, threads):
-    timeout = 1
+    # timeout = 1  # UNUSED
     
     bisleep = BreakableIncrementedSleep(INCREMENT_TIMEOUT, 1, MAX_TIMEOUT, engine.test_break)
 
@@ -140,7 +140,7 @@ def render_slave(engine, netsettings, threads):
     conn = clientConnection(netsettings.server_address, netsettings.server_port)
     
     if not conn:
-        timeout = 1
+        # timeout = 1  # UNUSED
         print("Connection failed, will try connecting again at most %i times" % MAX_CONNECT_TRY)
         bisleep.reset()
         
diff --git a/netrender/thumbnail.py b/netrender/thumbnail.py
index 2ead6e82..11fe0ec9 100644
--- a/netrender/thumbnail.py
+++ b/netrender/thumbnail.py
@@ -23,7 +23,7 @@ import bpy
 
 def generate(filename, external=True):
     if external:
-        process = subprocess.Popen([sys.argv[0], "-b", "-noaudio", "-P", __file__, "--", filename], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        process = subprocess.Popen([sys.argv[0],"-b", "-noaudio", "-P", __file__, "--", filename], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         while process.poll() is None:
             process.stdout.read(1024) # empty buffer to be sure
         process.stdout.read()
@@ -72,7 +72,6 @@ def _internal(filename):
     return None
 
 if __name__ == "__main__":
-    import bpy
     try:
         start = sys.argv.index("--") + 1
     except ValueError:
diff --git a/netrender/ui.py b/netrender/ui.py
index 6993173d..068d77b3 100644
--- a/netrender/ui.py
+++ b/netrender/ui.py
@@ -17,16 +17,15 @@
 # ##### END GPL LICENSE BLOCK #####
 
 import bpy
-import sys, os
-import http, http.client, http.server, urllib
-import subprocess, shutil, time, hashlib
+import os
+import time
 
 import netrender
-import netrender.slave as slave
-import netrender.master as master
 
 from netrender.utils import *
 
+from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty
+
 VERSION = b"0.3"
 
 PATH_PREFIX = "/tmp/"
@@ -361,7 +360,6 @@ class RENDER_PT_network_output(NeedValidAddress, NetRenderButtonsPanel, bpy.type
 class NetRenderSlave(bpy.types.PropertyGroup):
     @classmethod
     def register(NetRenderSlave):
-        from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty
 
         NetRenderSlave.name = StringProperty(
                         name="Name of the slave",
@@ -372,7 +370,6 @@ class NetRenderSlave(bpy.types.PropertyGroup):
 class NetRenderJob(bpy.types.PropertyGroup):
     @classmethod
     def register(NetRenderJob):
-        from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty
 
         NetRenderJob.name = StringProperty(
                         name="Name of the job",
@@ -383,7 +380,6 @@ class NetRenderJob(bpy.types.PropertyGroup):
 class NetRenderSettings(bpy.types.PropertyGroup):
     @classmethod
     def register(NetRenderSettings):
-        from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty
 
         def address_update_callback(self, context):
             netsettings = context.scene.network_render
diff --git a/netrender/utils.py b/netrender/utils.py
index b0c8eb0b..d615685a 100644
--- a/netrender/utils.py
+++ b/netrender/utils.py
@@ -17,9 +17,8 @@
 # ##### END GPL LICENSE BLOCK #####
 
 import sys, os
-import re
-import http, http.client, http.server, urllib, socket
-import subprocess, shutil, time, hashlib, zlib
+import http, http.client, http.server, socket
+import subprocess, time, hashlib
 
 import netrender, netrender.model
 
diff --git a/netrender/versioning.py b/netrender/versioning.py
index d4892e3e..31bb2f8b 100644
--- a/netrender/versioning.py
+++ b/netrender/versioning.py
@@ -1,4 +1,22 @@
-import sys, os
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+import os
 import re
 import subprocess