Merge pull request #2 from pydanny/master

Add Python 3.5 support

markdownx/forms.py

@@ -1,9 +1,10 @@
 import os
 import uuid
-import StringIO
+
 
 from django import forms
 from django.conf import settings
+from django.utils.six import StringIO
 from django.utils.translation import ugettext_lazy as _
 from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.template import defaultfilters as filters

markdownx/widgets.py

@@ -9,7 +9,9 @@ from .settings import MARKDOWNX_EDITOR_RESIZABLE
 class MarkdownxWidget(forms.Textarea):
 
     def render(self, name, value, attrs=None):
-        if attrs.has_key('class'):
+        if attrs is None:
+            attrs = {}
+        elif 'class' in attrs:
             attrs['class'] += ' markdownx-editor'
         else:
             attrs.update({'class':'markdownx-editor'})

setup.py

@@ -29,6 +29,7 @@ setup(
         'Topic :: Software Development :: User Interfaces',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: JavaScript',
     ],
     keywords='django markdown live preview images upload',