From ca8d30466c5aa084bb740fe583a687f18d3f9af6 Mon Sep 17 00:00:00 2001
From: Conrad Weidenkeller <conrad.weidenkeller@rackspace.com>
Date: Tue, 23 Nov 2010 19:26:02 -0600
Subject: [PATCH] PEP 8 compliance and small modification to mime.types file

---
 etc/mime.types-sample | 5 +++++
 swift/proxy/server.py | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/etc/mime.types-sample b/etc/mime.types-sample
index d1d86bc513..456cfec4e1 100644
--- a/etc/mime.types-sample
+++ b/etc/mime.types-sample
@@ -3,3 +3,8 @@
 # Please enter Mime-Types in standard mime.types format #
 # Mime-Type Extension ex. image/jpeg jpg                #
 #########################################################
+
+#EX. Mime-Type Extension
+#    foo/bar   foo
+
+
diff --git a/swift/proxy/server.py b/swift/proxy/server.py
index c5ee8745b7..b8e4ae9bf1 100644
--- a/swift/proxy/server.py
+++ b/swift/proxy/server.py
@@ -1268,7 +1268,8 @@ class BaseApplication(object):
         self.account_ring = account_ring or \
             Ring(os.path.join(swift_dir, 'account.ring.gz'))
         self.memcache = memcache
-        mimetypes.init(mimetypes.knownfiles + [os.path.join(self.swift_dir, 'mime.types')])
+        mimetypes.init(mimetypes.knownfiles + 
+                       [os.path.join(self.swift_dir, 'mime.types')])
 
     def get_controller(self, path):
         """