X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/46997a51ed0ceb16ddbac712fbcb552a86cdc9e2..61b73fe068172f02d6c47e2b5387161919ec9618:/philo/templatetags/embed.py

diff --git a/philo/templatetags/embed.py b/philo/templatetags/embed.py
index 20e04a4..b024b1b 100644
--- a/philo/templatetags/embed.py
+++ b/philo/templatetags/embed.py
@@ -1,32 +1,13 @@
 """
 The embed template tags are automatically included as builtins if :mod:`philo` is an installed app.
 
-.. templatetag:: embed
-
-embed
------
-
-The {% embed %} tag can be used in two ways.
-
-First, to set which template will be used to render a particular model. This declaration can be placed in a base template and will propagate into all templates that extend that template.
-
-Syntax::
-
-	{% embed <app_label>.<model_name> with <template> %}
-
-Second, to embed a specific model instance in the document with a template specified earlier in the template or in a parent template using the first syntax. The instance can be specified as a content type and pk or as a context variable. Any kwargs provided will be passed into the context of the template.
-
-Syntax::
-
-	{% embed (<app_label>.<model_name> <object_pk> || <instance>) [<argname>=<value> ...] %}
-
 """
 from django import template
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.template.loader_tags import ExtendsNode, BlockContext, BLOCK_CONTEXT_KEY, TextNode, BlockNode
 
-from philo.utils import LOADED_TEMPLATE_ATTR
+from philo.utils.templates import LOADED_TEMPLATE_ATTR
 
 
 register = template.Library()
@@ -304,16 +285,28 @@ def parse_content_type(bit, tagname):
 	except ValueError:
 		raise template.TemplateSyntaxError('"%s" template tag expects the first argument to be of the form app_label.model' % tagname)
 	try:
-		ct = ContentType.objects.get(app_label=app_label, model=model)
+		ct = ContentType.objects.get_by_natural_key(app_label, model)
 	except ContentType.DoesNotExist:
 		raise template.TemplateSyntaxError('"%s" template tag requires an argument of the form app_label.model which refers to an installed content type (see django.contrib.contenttypes)' % tagname)
 	return ct
 
 
-def do_embed(parser, token):
+@register.tag
+def embed(parser, token):
 	"""
-	{% embed <app_label>.<model_name> with <template> %}
-	{% embed (<app_label>.<model_name> <object_pk> || <instance>) [<argname>=<value> ...] %}
+	The {% embed %} tag can be used in two ways.
+	
+	First, to set which template will be used to render a particular model. This declaration can be placed in a base template and will propagate into all templates that extend that template.
+	
+	Syntax::
+	
+		{% embed <app_label>.<model_name> with <template> %}
+	
+	Second, to embed a specific model instance in the document with a template specified earlier in the template or in a parent template using the first syntax. The instance can be specified as a content type and pk or as a context variable. Any kwargs provided will be passed into the context of the template.
+	
+	Syntax::
+	
+		{% embed (<app_label>.<model_name> <object_pk> || <instance>) [<argname>=<value> ...] %}
 	
 	"""
 	bits = token.split_contents()
@@ -354,7 +347,4 @@ def do_embed(parser, token):
 	except ValueError:
 		return EmbedNode(ct, object_pk=parser.compile_filter(pk), kwargs=kwargs)
 	else:
-		return ConstantEmbedNode(ct, object_pk=pk, kwargs=kwargs)
-
-
-register.tag('embed', do_embed)
\ No newline at end of file
+		return ConstantEmbedNode(ct, object_pk=pk, kwargs=kwargs)
\ No newline at end of file