Changeset 3525

Timestamp:

30 Jun 2008, 14:35:08 (16 years ago)

Author:

uli

Message:

Remove Python2.5 stuff.

File:

• waeup/trunk/src/waeup/catalog.py (modified) (5 diffs)

waeup/trunk/src/waeup/catalog.py

@@ -1 @@
-from __future__ import with_statement
 import sys
 import csv
@@ -41 +40 @@
     def render(self):
         t = [0]
-        with accum_time(t):
-            src = os.path.join(os.path.dirname(__file__), 'tests',
-                               'results2.csv')
-            inputfile = file(src, "r")
-            num = 0
-            headers, rows = readFile(inputfile)
-            for i in rows:
-                s = Student(i)
-                self.context[str(num)] = s
-                num += 1
+        src = os.path.join(os.path.dirname(__file__), 'tests',
+                           'results2.csv')
+        inputfile = file(src, "r")
+        num = 0
+        headers, rows = readFile(inputfile)
+        for i in rows:
+             s = Student(i)
+             self.context[str(num)] = s
+             num += 1
         return "%s new Students added in %s" % (num, t[0])
 
@@ -62 +60 @@
         return "\n".join(result)
 
-import contextlib, time
-
 class ExportStudents(grok.View):
     grok.context(University)
@@ -69 +65 @@
     def render(self):
         t = [0]
-        with accum_time(t):
-            result = []
-            for s in self.context.values():
-                result.append(s.getCsv())
-            writeFile(result)
+        result = []
+        for s in self.context.values():
+             result.append(s.getCsv())
+        writeFile(result)
         return "yeah %s" % t[0]
         
@@ -91 +86 @@
     writer.writerows(data)
 
-@contextlib.contextmanager
-def accum_time(L):
-  """
-  Add time used inside a with block to the value of L[0].
-  """
-  start = time.clock()
-  try:
-    yield
-  finally:
-    end = time.clock()
-    L[0] += end - start