Server: tweaked blender-render job compiler

The compiler is now actually registering, and the 'format' parameter
is optional. This also required the frame_range_merge() function to
return unicode strings (which is a good idea anyway).

packages/flamenco/flamenco/job_compilers/__init__.py

@@ -17,7 +17,7 @@ def register_compiler(job_type):
 
 
 # Import subpackages to register the compilers
-from . import sleep
+from . import sleep, blender_render
 
 
 def compile_job(job):

packages/flamenco/flamenco/job_compilers/blender_render.py

@@ -23,7 +23,7 @@ class BlenderRender(AbstractJobCompiler):
             task_cmds = [
                 commands.BlenderRender(
                     filepath=job_settings['filepath'],
-                    format=job_settings['format'],
+                    format=job_settings.get('format'),
                     render_output=job_settings.get('render_output'),
                     frames=frame_range_bstyle)
             ]

packages/flamenco/flamenco/job_compilers/commands.py

@@ -37,7 +37,7 @@ class BlenderRender(AbstractCommand):
     # blend file path.
     filepath = attr.ib(validator=attr.validators.instance_of(unicode))
     # output format.
-    format = attr.ib(validator=attr.validators.instance_of(unicode))
+    format = attr.ib(validator=attr.validators.optional(attr.validators.instance_of(unicode)))
     # output file path, defaults to the path in the blend file itself.
     render_output = attr.ib(
         validator=attr.validators.optional(attr.validators.instance_of(unicode)))

packages/flamenco/flamenco/utils.py

@@ -40,9 +40,9 @@ def frame_range_merge(frames_list=None, blender_style=False):
     :Example:
     >>> frames = [1, 3, 4, 5, 8]
     >>> frame_range_merge(frames)
-    '1,3-5,8'
+    u'1,3-5,8'
     >>> frame_range_merge(frames, blender_style=True)
-    '1,3..5,8'
+    u'1,3..5,8'
     """
     if not frames_list:
         return ""
@@ -63,7 +63,7 @@ def frame_range_merge(frames_list=None, blender_style=False):
                 ranges.append(str(start_frame))
                 ranges.append(str(prev_frame))
             else:
-                ranges.append("{}{}{}".format(start_frame, range_sep, prev_frame))
+                ranges.append(u'{}{}{}'.format(start_frame, range_sep, prev_frame))
             start_frame = current_frame
         prev_frame = current_frame
     if start_frame == current_frame:
@@ -72,8 +72,8 @@ def frame_range_merge(frames_list=None, blender_style=False):
         ranges.append(str(start_frame))
         ranges.append(str(current_frame))
     else:
-        ranges.append("{}{}{}".format(start_frame, range_sep, current_frame))
-    return ",".join(ranges)
+        ranges.append(u'{}{}{}'.format(start_frame, range_sep, current_frame))
+    return u','.join(ranges)
 
 
 def iter_frame_range(merged_frame_range, chunk_size):