7 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -105,4 +105,4 @@ def _run_tests(tags):
105
105
# If exceptions happened, re-throw the last one
106
106
if self .exc_info :
107
107
ex_type , exception , tb = self .exc_info
108
- raise ex_type ( exception ). with_traceback ( tb )
108
+ raise ex_type , exception , tb
Original file line number Diff line number Diff line change @@ -210,7 +210,7 @@ def main():
210
210
options .cwd ,
211
211
symbols_path = options .symbols_path ,
212
212
utility_path = options .utility_path )
213
- except Exception as e :
213
+ except Exception , e :
214
214
log .error (str (e ))
215
215
result = False
216
216
sys .exit (0 if result else 1 )
Original file line number Diff line number Diff line change 4
4
# License, v. 2.0. If a copy of the MPL was not distributed with this
5
5
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
6
6
7
- from __future__ import absolute_import , print_function
8
7
import os
9
8
import sys
10
9
import subprocess
Original file line number Diff line number Diff line change 4
4
# License, v. 2.0. If a copy of the MPL was not distributed with this
5
5
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
6
6
7
- from __future__ import absolute_import , print_function , with_statement
7
+ from __future__ import with_statement
8
8
import sys
9
9
import os
10
10
from optparse import OptionParser
Original file line number Diff line number Diff line change 39
39
- testing/mochitest
40
40
- testing/mozharness
41
41
- testing/raptor
42
+ - testing/remotecppunittests.py
43
+ - testing/runcppunittests.py
42
44
- testing/runtimes
43
45
- testing/tools
44
46
- testing/tps
Original file line number Diff line number Diff line change 25
25
- security/manager/ssl
26
26
- servo
27
27
- testing/awsy
28
+ - testing/firefox-ui/harness/firefox_ui_harness/runners/update.py
29
+ - testing/gtest
28
30
- testing/mochitest
29
31
- testing/mozharness
30
32
- testing/raptor
35
37
- tools/jprof
36
38
- tools/profiler
37
39
- tools/rb
40
+ - tools/update-packaging
38
41
- xpcom/idl-parser
39
42
extensions : ['py']
40
43
support-files :
Original file line number Diff line number Diff line change @@ -38,16 +38,11 @@ def check_compat_py2(f):
38
38
futures = set ()
39
39
haveprint = False
40
40
future_lineno = 1
41
- may_have_relative_imports = False
42
41
for node in ast .walk (root ):
43
42
if isinstance (node , ast .ImportFrom ):
44
43
if node .module == '__future__' :
45
44
future_lineno = node .lineno
46
45
futures |= set (n .name for n in node .names )
47
- else :
48
- may_have_relative_imports = True
49
- elif isinstance (node , ast .Import ):
50
- may_have_relative_imports = True
51
46
elif isinstance (node , ast .Print ):
52
47
haveprint = True
53
48
@@ -57,7 +52,7 @@ def check_compat_py2(f):
57
52
'column' : 1 ,
58
53
}
59
54
60
- if 'absolute_import' not in futures and may_have_relative_imports :
55
+ if 'absolute_import' not in futures :
61
56
err ['rule' ] = 'require absolute_import'
62
57
err ['message' ] = 'Missing from __future__ import absolute_import'
63
58
print (json .dumps (err ))
0 commit comments