Commits

dirkbaechle committed 364df08

- some code rewrites, in order to get the source compliant to pylint

  • Participants
  • Parent commits a90f3d8

Comments (0)

Files changed (2)

File src/engine/SCons/BuilderTests.py

         builder = SCons.Builder.Builder(action=SCons.Action.Action(func,None),
                                         single_source = 1, suffix='.out')
         env['CNT'] = [0]
-        tgt = builder(env, target=outfiles[0], source=infiles[0])[0]
+        # Please, don't change this to builder(...), or pylint will choke on it
+        tgt = builder.__call__(env, target=outfiles[0], source=infiles[0])[0]
         s = str(tgt)
         t = os.path.normcase(test.workpath('0.out'))
         assert os.path.normcase(s) == t, s
         tgt.prepare()
         tgt.build()
         assert env['CNT'][0] == 1, env['CNT'][0]
-        tgt = builder(env, outfiles[1], infiles[1])[0]
+        # Please, don't change this to builder(...), or pylint will choke on it
+        tgt = builder.__call__(env, outfiles[1], infiles[1])[0]
         s = str(tgt)
         t = os.path.normcase(test.workpath('1.out'))
         assert os.path.normcase(s) == t, s
         tgt.prepare()
         tgt.build()
         assert env['CNT'][0] == 2
-        tgts = builder(env, None, infiles[2:4])
+        # Please, don't change this to builder(...), or pylint will choke on it
+        tgts = builder.__call__(env, None, infiles[2:4])
         s = list(map(str, tgts))
         expect = [test.workpath('2.out'), test.workpath('3.out')]
         expect = list(map(os.path.normcase, expect))
         tgts[1].build()
         assert env['CNT'][0] == 4
         try:
-            tgt = builder(env, outfiles[4], infiles[4:6])
+            # Please, don't change this to builder(...), or pylint will choke on it
+            tgt = builder.__call__(env, outfiles[4], infiles[4:6])
         except SCons.Errors.UserError:
             pass
         else:
 
         env = Environment()
         builder = SCons.Builder.Builder(action = function2)
-
-        tgts = builder(env, source=[])
+        # Please, don't change this to builder(...), or pylint will choke on it
+        tgts = builder.__call__(env, source=[])
         assert tgts == [], tgts
 
-        tgts = builder(env, target = [outfile, outfile2], source = infile)
+        # Please, don't change this to builder(...), or pylint will choke on it
+        tgts = builder.__call__(env, target = [outfile, outfile2], source = infile)
         for t in tgts:
             t.prepare()
         try:
             return 1
 
         builder = SCons.Builder.Builder(action = function3)
-        tgts = builder(env, target = [sub1_out, sub2_out], source = infile)
+        # Please, don't change this to builder(...), or pylint will choke on it
+        tgts = builder.__call__(env, target = [sub1_out, sub2_out], source = infile)
         for t in tgts:
             t.prepare()
         try:

File src/engine/SCons/Tool/packaging/msi.py

 
     # put the arguments into the env and call the specfile builder.
     env['msi_spec'] = kw
-    specfile = wxs_builder(* [env, target, source], **kw)
+    # Please, don't change this to wxs_builder(...), or pylint will choke on it
+    specfile = wxs_builder.__call__(env, target, source, **kw)
 
     # now call the WiX Tool with the built specfile added as a source.
     msifile  = env.WiX(target, specfile)