From 165914074fa2dea3e48ad4a0ae40a2cb8ff8e0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu> Date: Tue, 31 Jan 2017 18:25:19 +0100 Subject: [PATCH] Server: some more explicit Unicode strings --- packages/flamenco/flamenco/job_compilers/blender_render.py | 2 +- .../flamenco/job_compilers/blender_render_progressive.py | 4 ++-- packages/flamenco/flamenco/job_compilers/commands.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/flamenco/flamenco/job_compilers/blender_render.py b/packages/flamenco/flamenco/job_compilers/blender_render.py index ffc34468..78149c37 100644 --- a/packages/flamenco/flamenco/job_compilers/blender_render.py +++ b/packages/flamenco/flamenco/job_compilers/blender_render.py @@ -36,7 +36,7 @@ class BlenderRender(AbstractJobCompiler): cmd = commands.MoveOutOfWay(src=render_dest_dir) task_id = self.task_manager.api_create_task( - job, [cmd], 'move-existing-frames') + job, [cmd], u'move-existing-frames') return task_id diff --git a/packages/flamenco/flamenco/job_compilers/blender_render_progressive.py b/packages/flamenco/flamenco/job_compilers/blender_render_progressive.py index 7a5fbd79..a766a08d 100644 --- a/packages/flamenco/flamenco/job_compilers/blender_render_progressive.py +++ b/packages/flamenco/flamenco/job_compilers/blender_render_progressive.py @@ -49,7 +49,7 @@ class BlenderRenderProgressive(BlenderRender): # uses. render_task_ids = self._make_progressive_render_tasks( job, - 'render-smpl%i-%i-frm%%s' % (cycles_samples_from, cycles_samples_to), + u'render-smpl%i-%i-frm%%s' % (cycles_samples_from, cycles_samples_to), move_existing_task_id, cycles_chunk_idx + 1, cycles_samples_from, @@ -65,7 +65,7 @@ class BlenderRenderProgressive(BlenderRender): else: merge_task_ids = self._make_merge_tasks( job, - 'merge-to-smpl%i-frm%%s' % cycles_samples_to, + u'merge-to-smpl%i-frm%%s' % cycles_samples_to, cycles_chunk_idx + 1, next_merge_task_deps, render_task_ids, diff --git a/packages/flamenco/flamenco/job_compilers/commands.py b/packages/flamenco/flamenco/job_compilers/commands.py index bda838ba..6dfe6633 100644 --- a/packages/flamenco/flamenco/job_compilers/commands.py +++ b/packages/flamenco/flamenco/job_compilers/commands.py @@ -13,7 +13,7 @@ class AbstractCommand(object): """Returns the command name.""" from flamenco.utils import camel_case_to_lower_case_underscore - return camel_case_to_lower_case_underscore(cls.__name__) + return camel_case_to_lower_case_underscore(unicode(cls.__name__)) def to_dict(self): """Returns a dictionary representation of this command, for JSON serialisation.""" -- GitLab