From: W. Trevor King <wking@drexel.edu>
Date: Wed, 21 Jul 2010 18:29:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://einstein/~/public_html/code/git/cookbook
X-Git-Tag: v0.1~17^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6a5d98e33ece195966ede3a4702e95729922817;p=cookbook.git

Merge branch 'master' of ssh://einstein/~/public_html/code/git/cookbook
---

c6a5d98e33ece195966ede3a4702e95729922817
diff --cc cookbook/server.py
index 839afa2,580813c..516d661
--- a/cookbook/server.py
+++ b/cookbook/server.py
@@@ -18,9 -18,10 +18,11 @@@
  """Serve cookbooks over HTTP.
  """
  
+ from __future__ import with_statement
+ 
  import os
  import random
 +import re
  import types
  from xml.sax import saxutils