Revert 243980 "Docserver: Support markdown for HTML content."

trunk/src/chrome/common/extensions/docs/server2/content_provider.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import mimetypes
-import posixpath
+import os
 
 from compiled_file_system import SingleFile
 from directory_zipper import DirectoryZipper
 from docs_server_utils import ToUnicode
-from file_system import FileNotFoundError
 from future import Gettable, Future
 from third_party.handlebar import Handlebar
-from third_party.markdown import markdown
 
 
 class ContentAndType(object):
   '''Return value from ContentProvider.GetContentAndType.
   '''
 
   def __init__(self, content, content_type):
     self.content = content
     self.content_type = content_type
 
@@ skipping 25 matching lines @@
     self._supports_templates = supports_templates
     if supports_zip:
       self._directory_zipper = DirectoryZipper(compiled_fs_factory, file_system)
     else:
       self._directory_zipper = None
 
   @SingleFile
   def _CompileContent(self, path, text):
     assert text is not None, path
     mimetype = mimetypes.guess_type(path)[0]
-    if posixpath.splitext(path)[1] == '.md':
-      # See http://pythonhosted.org/Markdown/extensions
-      # for details on "extensions=".
-      content = markdown(ToUnicode(text),
-                         extensions=('extra', 'headerid', 'sane_lists'))
-      if self._supports_templates:
-        content = Handlebar(content, name=path)
-      mimetype = 'text/html'
-    elif mimetype is None:
+    if mimetype is None:
       content = text
       mimetype = 'text/plain'
     elif mimetype == 'text/html':
       content = ToUnicode(text)
       if self._supports_templates:
         content = Handlebar(content, name=path)
     elif (mimetype.startswith('text/') or
           mimetype in ('application/javascript', 'application/json')):
       content = ToUnicode(text)
     else:
       content = text
     return ContentAndType(content, mimetype)
 
-  def _MaybeMarkdown(self, path):
-    if posixpath.splitext(path)[1] != '.html':
-      return path
-
-    dirname, file_name = posixpath.split(path)
-    if dirname != '':
-      dirname = dirname + '/'
-    file_list = self.file_system.ReadSingle(dirname).Get()
-    if file_name in file_list:
-      return path
-
-    if posixpath.splitext(file_name)[0] + '.md' in file_list:
-      return posixpath.splitext(path)[0] + '.md'
-    return path
-
   def GetContentAndType(self, path):
     path = path.lstrip('/')
-    base, ext = posixpath.splitext(path)
+    base, ext = os.path.splitext(path)
 
     # Check for a zip file first, if zip is enabled.
     if self._directory_zipper and ext == '.zip':
       zip_future = self._directory_zipper.Zip(base)
       return Future(delegate=Gettable(
           lambda: ContentAndType(zip_future.Get(), 'application/zip')))
 
-    return self._content_cache.GetFromFile(self._MaybeMarkdown(path))
+    return self._content_cache.GetFromFile(path)
 
   def Cron(self):
     # Running Refresh() on the file system is enough to pull GitHub content,
     # which is all we need for now while the full render-every-page cron step
     # is in effect.
     # TODO(kalman): Walk over the whole filesystem and compile the content.
     return self.file_system.Refresh()
 
   def __repr__(self):
     return 'ContentProvider of <%s>' % repr(self.file_system)