launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-fix-jsbuild into launchpad:master.

Commit message:
Fix another bytes/str issue in jsbuild

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/391261

resource_prefix is always supposed to be bytes.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-fix-jsbuild into launchpad:master.

diff --git a/lib/lp/scripts/utilities/js/jsbuild.py b/lib/lp/scripts/utilities/js/jsbuild.py
index 8424adc..84f76fd 100644
--- a/lib/lp/scripts/utilities/js/jsbuild.py
+++ b/lib/lp/scripts/utilities/js/jsbuild.py
@@ -346,7 +346,7 @@ class Builder:
             # Embedded URL rewrite should start with build/ for correct
             # filesystem location, as node-sass cannot add it.
             combined_css = CSSComboFile(
-                css_files, skin_build_file, resource_prefix="build/")
+                css_files, skin_build_file, resource_prefix=b"build/")
             if combined_css.needs_update():
                 self.log('Updating %s...' % skin_build_file)
                 combined_css.update()