added GPL/license information back to file

[pyblosxom-markdown2] / markdown-plugin.py

diff --git a/markdown-plugin.py b/markdown-plugin.py
index 8a262b051b86cb586a0ead05b936a32a6f176256..ba46a6543582aaf42b51f18e8a57b25ca450f0f1 100644 (file)
--- a/markdown-plugin.py
+++ b/markdown-plugin.py
@@ -19,30 +19,20 @@ this:
 Now any posts with filenames ending in one of the FILENAME_EXTENSIONS defined
 below will be passed through python-markdown.
 
-Copyright (C) Benjamin Mako Hill, 2005
-Updated for Python Markdown 2 by seanh 2009
+Copyright (C) 2005, 2011 Benjamin Mako Hill
+Copyright (c) 2009, 2010, seanh
 
-This program is free software; you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later versi
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 """
 _version__ = '0.3'
 __author__ = 'Benjamin Mako Hill <mako@atdot.cc>'
 __author__ = 'seanh <snhmnd@gmail.com>'
 
-FILENAME_EXTENSIONS = ('.txt','.text','.mkdn','.markdown','.md','.mdown','.markdn','.mkd')
+FILENAME_EXTENSIONS = ('.mdwn', '.txt','.text','.mkdn','.markdown','.md','.mdown','.markdn','.mkd')
 
 import markdown
 import os
@@ -52,6 +42,6 @@ md = markdown.Markdown(output_format='html4',extensions=['extra',])
 def cb_story(args):
        entry = args['entry']
        if os.path.splitext(entry['filename'])[1] in FILENAME_EXTENSIONS:
-               entry['body'] = md.convert(''.join(entry['body']))
+               entry['body'] = md.convert(u''.join(entry['body'].decode("utf-8")))
                md.reset()
        return args