Rev 8: Add a parameter to disable using .pyc files. in http://people.ubuntu.com/~robertc/baz2.0/plugins/piss/trunk

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/piss/trunk

------------------------------------------------------------
revno: 8
revision-id: robertc at robertcollins.net-20070819065225-vw68031u3xpbgdqm
parent: robertc at robertcollins.net-20070819064600-0zp9lp3jubju05g0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Sun 2007-08-19 16:52:25 +1000
message:
  Add a parameter to disable using .pyc files.
modified:
  benchmarks/__init__.py         __init__.py-20070501062416-23ztx65da4ul4oxv-6
  benchmarks/bench_import.py     bench_import.py-20070501062416-23ztx65da4ul4oxv-7
=== modified file 'benchmarks/__init__.py'
--- a/benchmarks/__init__.py	2007-08-19 06:46:00 +0000
+++ b/benchmarks/__init__.py	2007-08-19 06:52:25 +0000
@@ -38,14 +38,18 @@
     # decoration
     for decorated in (False, True):
         for functions in (0, 10, 100, 1000, 10000):
-            scenario_name_bits = []
-            scenario = {}
-            if decorated:
-                scenario_name_bits.append('decorated')
-            scenario['decorated'] = decorated
-            scenario_name_bits.append('%d functions' % functions)
-            scenario['functions'] = functions
-            applier.scenarios.append((','.join(scenario_name_bits), scenario))
+            for including_compile in (False, True):
+                scenario_name_bits = []
+                scenario = {}
+                if decorated:
+                    scenario_name_bits.append('decorated')
+                scenario['decorated'] = decorated
+                scenario_name_bits.append('%d functions' % functions)
+                scenario['functions'] = functions
+                if not including_compile:
+                    scenario_name_bits.append('pre-compiled')
+                scenario['compile'] = including_compile
+                applier.scenarios.append((','.join(scenario_name_bits), scenario))
     result = TestSuite()
     adapt_modules(module_names, applier, loader, result)
     return result

=== modified file 'benchmarks/bench_import.py'
--- a/benchmarks/bench_import.py	2007-08-19 06:46:00 +0000
+++ b/benchmarks/bench_import.py	2007-08-19 06:52:25 +0000
@@ -31,16 +31,19 @@
         TestCaseWithTransport.setUp(self)
         self.creator = _mod_creator.Creator()
 
-    def time_importing_module(self, num_functions, decorated=False):
+    def time_importing_module(self, num_functions, decorated=False,
+            compile=False):
         self.add_cwd_to_path()
-        # import once to generate a .pyc - the common case.
         self.creator.build_module('tiny_piss', num_functions=num_functions,
             decorated=decorated)
-        self.import_and_forget('tiny_piss')
+        if not compile:
+            # import once to generate a .pyc - the common case.
+            self.import_and_forget('tiny_piss')
         self.time(self.import_and_forget, 'tiny_piss')
 
     def test_import_parameterised(self):
-        self.time_importing_module(self.functions, decorated=self.decorated)
+        self.time_importing_module(self.functions, decorated=self.decorated,
+            compile=self.compile)
 
     def add_cwd_to_path(self):
         sys.path.append(os.getcwd())