Merge tk274 performance work back to trunk. Closes #274.

svn path=/trunk/; revision=4878

1 files changed, 13 insertions, 1 deletions

diff --git a/rpkid/rpki/csv_utils.py b/rpkid/rpki/csv_utils.py
index f7eed414..30d07560 100644
--- a/rpkid/rpki/csv_utils.py
+++ b/rpkid/rpki/csv_utils.py
@@ -3,7 +3,7 @@ CSV utilities, moved here from myrpki.py.
 
 $Id$
 
-Copyright (C) 2009--2011  Internet Systems Consortium ("ISC")
+Copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -68,6 +68,12 @@ class csv_reader(object):
         fields += tuple(None for i in xrange(self.columns - len(fields)))
       yield fields
 
+  def __enter__(self):
+    return self
+
+  def __exit__(self, _type, value, traceback):
+    self.file.close()
+
 class csv_writer(object):
   """
   Writer object for tab delimited text.  We just use the stock CSV
@@ -83,6 +89,12 @@ class csv_writer(object):
     self.file = open(self.renmwo, "w")
     self.writer = csv.writer(self.file, dialect = csv.get_dialect("excel-tab"))
 
+  def __enter__(self):
+    return self
+
+  def __exit__(self, _type, value, traceback):
+    self.close()
+
   def close(self):
     """
     Close this writer.