[Pkg-mozext-commits] [adblock-plus] 324/464: Made sure the JS shell reads its input as UTF-8

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 7f0b55bfa4f097d1cb8fce00082207763e7209cb
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Oct 31 12:03:35 2012 +0100

    Made sure the JS shell reads its input as UTF-8
---
 abp_rewrite.py | 4 ++--
 autotest.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/abp_rewrite.py b/abp_rewrite.py
index e599fa8..5bb16dd 100644
--- a/abp_rewrite.py
+++ b/abp_rewrite.py
@@ -25,7 +25,7 @@ def doRewrite():
     basedir = '.'
 
   application = ensureJSShell(basedir)
-  command = [application, os.path.join(basedir, 'jshydra.js'), os.path.join(basedir, 'scripts', 'abprewrite.js'), '--arg', 'module=true source_repo=https://hg.adblockplus.org/adblockplus/']
+  command = [application, '-U', os.path.join(basedir, 'jshydra.js'), os.path.join(basedir, 'scripts', 'abprewrite.js'), '--arg', 'module=true source_repo=https://hg.adblockplus.org/adblockplus/']
   for module in ('filterNotifier', 'filterClasses', 'subscriptionClasses', 'filterStorage', 'elemHide', 'matcher', 'filterListener', 'synchronizer'):
     sourceFile = os.path.join(sourceDir, 'lib', module + '.js')
     if not os.path.exists(sourceFile):
@@ -36,7 +36,7 @@ def doRewrite():
   out = open(os.path.join(targetDir, 'lib', 'adblockplus.js'), 'wb')
   subprocess.Popen(command, stdout=out).communicate()
 
-  command = [application, os.path.join(basedir, 'jshydra.js'), os.path.join(basedir, 'scripts', 'abprewrite.js'), '--arg', 'source_repo=https://hg.adblockplus.org/adblockplustests/']
+  command = [application, '-U', os.path.join(basedir, 'jshydra.js'), os.path.join(basedir, 'scripts', 'abprewrite.js'), '--arg', 'source_repo=https://hg.adblockplus.org/adblockplustests/']
   for test in ('domainRestrictions', 'filterClasses', 'filterNotifier', 'filterStorage', 'matcher', 'regexpFilters_matching', 'subscriptionClasses'):
     sourceFile = os.path.join(testsDir, 'chrome', 'content', 'tests', test + '.js')
     if not os.path.exists(sourceFile):
diff --git a/autotest.py b/autotest.py
index 4c71c5d..4b2069e 100644
--- a/autotest.py
+++ b/autotest.py
@@ -34,7 +34,7 @@ def run_tests():
     if arguments == None:
       continue
 
-    command = [application, os.path.join(basedir, 'jshydra.js'), file] + arguments
+    command = [application, '-U', os.path.join(basedir, 'jshydra.js'), file] + arguments
     out = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].replace('\r', '')
     expected = open(file + '.expected', 'r').read().replace('\r', '')
     if out == expected:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git