Massive merge

2 files changed, 13 insertions, 3 deletions

diff --git a/examples/blogpost/models.py b/examples/blogpost/models.py
index d77f530d..10732ab4 100644
--- a/examples/blogpost/models.py
+++ b/examples/blogpost/models.py
@@ -2,6 +2,7 @@ from django.db import models
 from django.template.defaultfilters import slugify
 import uuid
 
+
 def uuid_str():
     return str(uuid.uuid1())
 
@@ -14,6 +15,7 @@ RATING_CHOICES = ((0, 'Awful'),
 
 MAX_POSTS = 10
 
+
 class BlogPost(models.Model):
     key = models.CharField(primary_key=True, max_length=64, default=uuid_str, editable=False)
     title = models.CharField(max_length=128)
@@ -37,4 +39,3 @@ class Comment(models.Model):
     comment = models.TextField()
     rating = models.IntegerField(blank=True, null=True, choices=RATING_CHOICES, help_text='How did you rate this post?')
     created = models.DateTimeField(auto_now_add=True)
-
diff --git a/examples/blogpost/resources.py b/examples/blogpost/resources.py
index d11c5615..b3659cdf 100644
--- a/examples/blogpost/resources.py
+++ b/examples/blogpost/resources.py
@@ -11,8 +11,15 @@ class BlogPostResource(ModelResource):
     fields = ('created', 'title', 'slug', 'content', 'url', 'comments')
     ordering = ('-created',)
 
+    def url(self, instance):
+        return reverse('blog-post',
+                        kwargs={'key': instance.key},
+                        request=self.request)
+
     def comments(self, instance):
-        return reverse('comments', request, kwargs={'blogpost': instance.key})
+        return reverse('comments',
+                        kwargs={'blogpost': instance.key},
+                        request=self.request)
 
 
 class CommentResource(ModelResource):
@@ -24,4 +31,6 @@ class CommentResource(ModelResource):
     ordering = ('-created',)
 
     def blogpost(self, instance):
-        return reverse('blog-post', request, kwargs={'key': instance.blogpost.key})
+        return reverse('blog-post',
+                       kwargs={'key': instance.blogpost.key},
+                       request=self.request)