Skip to content

Commit

Permalink
Fixed an import error when using an older Django. Thanks to mdornseif…
Browse files Browse the repository at this point in the history
… for the original patch.
  • Loading branch information
toastdriven committed May 12, 2010
1 parent 87a258d commit 1f4090f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Expand Up @@ -7,7 +7,7 @@ Primary authors:

Contributors:

* None so far
* mdornseif for various patches

Thanks to Tav for providing validate_jsonp.py, placed in public domain.

Expand Down
4 changes: 3 additions & 1 deletion README.rst
Expand Up @@ -10,8 +10,8 @@ Requirements

* Python 2.4+
* Django 1.0+
* lxml (http://codespeak.net/lxml/) if using the XML serializer
* mimeparse (http://code.google.com/p/mimeparse/)
* lxml (http://codespeak.net/lxml/) if using the XML serializer
* pyyaml (http://pyyaml.org/) if using the YAML serializer


Expand All @@ -31,6 +31,8 @@ about trying to help out friends/coworkers.
Reference Material
==================

* http://github.com/toastdriven/django-tastypie/tree/master/tests/basic shows
basic usage of tastypie
* http://en.wikipedia.org/wiki/REST
* http://en.wikipedia.org/wiki/List_of_HTTP_status_codes
* http://www.ietf.org/rfc/rfc2616.txt
Expand Down
6 changes: 6 additions & 0 deletions tastypie/resources.py
Expand Up @@ -19,6 +19,12 @@
set
except NameError:
from sets import Set as set
# The ``copy`` module was added in Python 2.5 and ``copycompat`` was added in
# post 1.1.1 Django (r11901)
try:
from django.utils.copycompat import deepcopy
except ImportError:
from copy import deepcopy


class ResourceOptions(object):
Expand Down

0 comments on commit 1f4090f

Please sign in to comment.