fixed bugs with django 1.4

Author: fitoria

README.rst

@@ -10,7 +10,7 @@ Installation and use
 2. add magicembed to INSTALLED_APPS
 3. In the template 
 ...
-{% load magicembed %}
+{% load magicembed_tags %}
 ...
 
 {{ video|magicembed:"640x480" }}

magicembed/__init__.py

@@ -0,0 +1 @@
+import providers

magicembed/templatetags/magicembed.py …gicembed/templatetags/magicembed_tags.pymagicembed/templatetags/magicembed.py renamed to magicembed/templatetags/magicembed_tags.py magicembed/templatetags/magicembed.py renamed to magicembed/templatetags/magicembed_tags.py

@@ -1,14 +1,17 @@
 from django import template
 from magicembed.providers import get_provider
+from django.utils.safestring import mark_safe
+
 register = template.Library()
 
-@register.filter
+@register.filter(is_safe=True)
 def magicembed(value, arg=None):
     '''value is the url and arg the size tuple
     ussage: {% http://myurl.com/|magicembed:"640x480" %}'''
     arg = [int(item) for item in arg.split('x')]
     provider = get_provider(value, arg)
-    return provider.render_video()
+
+    return mark_safe(provider.render_video())
 
 @register.filter
 def magicthumbnail(value):
@@ -17,4 +20,3 @@ def magicthumbnail(value):
     provider = get_provider(value)
     return provider.render_thumbnail()
 
-magicembed.is_safe = True

setup.py

@@ -1,34 +1,29 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-try:
-    from setuptools.core import setup
-except ImportError:
-    from distutils.core import setup
-
-import os
+from setuptools import setup, find_packages
 
 install_requires = [
     'Django>=1.0',
 ]
 
 setup(
     name = "magicembed",
-    version = "0.1",
+    version = "0.2",
     url = "http://github.com/fitoria/django-magicembed",
-    licence = 'MIT',
+    license = 'MIT',
     description = 'Django template filter utils to render videos an thumbnails.',
     author = 'Adolfo Fitoria',
     author_email = 'adolfo.fitoria@gmail.com',
     install_requires = install_requires,
-    packages = ['magicembed'],
+    packages = find_packages(),
     include_package_data = True,
     classifiers = [
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
         'Intended Audience :: Developers',
-        'Licence :: OSI Approved :: MIT Licence',
-        'Programming Languaje :: Python',
         'Topic :: Internet :: WWW/HTTP',
     ]
 )
+
+print "There are some changes in this new version please read: http://github.com/fitoria/django-magicembed"