From b1a4ed556ff8f893719b84627802fcdd435c435a Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 5 Jul 2012 22:09:13 -0500
Subject: [PATCH] no double import contenttype, thanks Salomon Derossi

---
 VERSION          | 2 +-
 gluon/globals.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 4d23a498..5faa260f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-05 22:06:22) dev
+Version 2.00.0 (2012-07-05 22:09:10) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index 63e22e0d..c1bb716a 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -329,7 +329,6 @@ class Response(Storage):
         downloads from http://..../download/filename
         """
 
-        import contenttype as c
         if not request.args:
             raise HTTP(404)
         name = request.args[-1]
@@ -343,7 +342,7 @@ class Response(Storage):
             (filename, stream) = field.retrieve(name)
         except IOError:
             raise HTTP(404)
-        self.headers['Content-Type'] = c.contenttype(name)
+        self.headers['Content-Type'] = contenttype(name)
         if attachment:
             self.headers['Content-Disposition'] = \
                 "attachment; filename=%s" % filename