diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-25 15:55:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-25 15:55:26 +0400 |
| commit | 0e2fbe6da195f07ed1f56fcb29b357a4e155253f (patch) | |
| tree | 4868dc0bc6517856eb91681e4f7118938f35bfab /netrender | |
| parent | dbb0d5e3c5568ee439340b63d0345d273cbcca1b (diff) | |
use sets when checking against multiple types
Diffstat (limited to 'netrender')
| -rw-r--r-- | netrender/client.py | 2 | ||||
| -rw-r--r-- | netrender/master.py | 6 | ||||
| -rw-r--r-- | netrender/ui.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/netrender/client.py b/netrender/client.py index 3cb0b437..0ad9a1e4 100644 --- a/netrender/client.py +++ b/netrender/client.py @@ -140,7 +140,7 @@ def sendJobVCS(conn, scene, anim = False): filename = filename[len(netsettings.vcs_wpath):] - if filename[0] in (os.sep, os.altsep): + if filename[0] in {os.sep, os.altsep}: filename = filename[1:] job.addFile(filename, signed=False) diff --git a/netrender/master.py b/netrender/master.py index 593ee727..3c087e58 100644 --- a/netrender/master.py +++ b/netrender/master.py @@ -311,7 +311,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): frame = job[frame_number] if frame: - if frame.status in (netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED): + if frame.status in {netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED}: self.send_head(http.client.ACCEPTED) elif frame.status == netrender.model.FRAME_DONE: self.server.stats("", "Sending result to client") @@ -379,7 +379,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): frame = job[frame_number] if frame: - if frame.status in (netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED): + if frame.status in {netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED}: self.send_head(http.client.ACCEPTED) elif frame.status == netrender.model.FRAME_DONE: filename = job.getResultPath(frame.getRenderFilename()) @@ -419,7 +419,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): frame = job[frame_number] if frame: - if not frame.log_path or frame.status in (netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED): + if not frame.log_path or frame.status in {netrender.model.FRAME_QUEUED, netrender.model.FRAME_DISPATCHED}: self.send_head(http.client.PROCESSING) else: self.server.stats("", "Sending log to client") diff --git a/netrender/ui.py b/netrender/ui.py index 4aa085c9..319c1067 100644 --- a/netrender/ui.py +++ b/netrender/ui.py @@ -116,7 +116,7 @@ class RENDER_PT_network_settings(NetRenderButtonsPanel, bpy.types.Panel): layout.prop(netsettings, "mode", expand=True) - if netsettings.mode in ("RENDER_MASTER", "RENDER_SLAVE"): + if netsettings.mode in {'RENDER_MASTER', 'RENDER_SLAVE'}: layout.operator("render.netclientstart", icon='PLAY') layout.prop(netsettings, "path") |