Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-19 20:19:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-19 20:19:08 +0400
commit9ac0a714bee5df2153e0a73bb55962139ba18eb2 (patch)
tree029104d14b7e942dd616bf8443e09d0461ac6350 /netrender
parent5e44117da5a35882e7f3919f4c48c234acebe045 (diff)
indentation edits and copy pyrimid from contrib (where I had made some edits), removed so this wont happen again.
Diffstat (limited to 'netrender')
-rw-r--r--netrender/master.py48
1 files changed, 24 insertions, 24 deletions
diff --git a/netrender/master.py b/netrender/master.py
index 66a5d4bd..c2f46c17 100644
--- a/netrender/master.py
+++ b/netrender/master.py
@@ -1036,35 +1036,35 @@ def saveMaster(path, httpd):
pickle.dump((httpd.path, httpd.jobs, httpd.slaves), f, pickle.HIGHEST_PROTOCOL)
def runMaster(address, broadcast, clear, path, update_stats, test_break):
- httpd = createMaster(address, clear, path)
- httpd.timeout = 1
- httpd.stats = update_stats
+ httpd = createMaster(address, clear, path)
+ httpd.timeout = 1
+ httpd.stats = update_stats
- if broadcast:
- s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
- s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+ if broadcast:
+ s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+ s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
- start_time = time.time() - 2
+ start_time = time.time() - 2
- while not test_break():
- try:
- httpd.handle_request()
- except select.error:
- pass
+ while not test_break():
+ try:
+ httpd.handle_request()
+ except select.error:
+ pass
- if time.time() - start_time >= 2: # need constant here
- httpd.timeoutSlaves()
+ if time.time() - start_time >= 2: # need constant here
+ httpd.timeoutSlaves()
- httpd.updateUsage()
+ httpd.updateUsage()
- if broadcast:
- print("broadcasting address")
- s.sendto(bytes("%i" % address[1], encoding='utf8'), 0, ('<broadcast>', 8000))
- start_time = time.time()
+ if broadcast:
+ print("broadcasting address")
+ s.sendto(bytes("%i" % address[1], encoding='utf8'), 0, ('<broadcast>', 8000))
+ start_time = time.time()
- httpd.server_close()
- if clear:
- clearMaster(httpd.path)
- else:
- saveMaster(path, httpd)
+ httpd.server_close()
+ if clear:
+ clearMaster(httpd.path)
+ else:
+ saveMaster(path, httpd)