Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators

* 'restframework2' of git://github.com/tomchristie/django-rest-framework: (56 commits)
  Bits of cleanup
  Add request.QUERY_PARAMS
  Add readonly 'id' field
  Tweak browseable API
  Don't display readonly fields
  Fix some bits of serialization
  Add csrf note
  Fix incorrect bit of tutorial
  Added tox.ini
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Clean up bits of templates etc
  Hack out bunch of unneccesary private methods on View class
  Clean up template tags
  Remove dumbass __all__ variables
  Remove old 'djangorestframework directories
  Change package name: djangorestframework -> rest_framework
  Dont strip final '/'
  Use get_script_prefix to play nicely if not installed at the root.
  ...

Conflicts:
	rest_framework/decorators.py

1 files changed, 7 insertions, 7 deletions

diff --git a/setup.py b/setup.py
index 5cd2a28f..19cf6d4c 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ def get_package_data(package):
     return {package: filepaths}
 
 
-version = get_version('djangorestframework')
+version = get_version('rest_framework')
 
 
 if sys.argv[-1] == 'publish':
@@ -52,18 +52,18 @@ if sys.argv[-1] == 'publish':
 
 
 setup(
-    name='djangorestframework',
+    name='rest_framework',
     version=version,
     url='http://django-rest-framework.org',
-    download_url='http://pypi.python.org/pypi/djangorestframework/',
+    download_url='http://pypi.python.org/pypi/rest_framework/',
     license='BSD',
     description='A lightweight REST framework for Django.',
     author='Tom Christie',
     author_email='tom@tomchristie.com',
-    packages=get_packages('djangorestframework'),
-    package_data=get_package_data('djangorestframework'),
-    test_suite='djangorestframework.runtests.runcoverage.main',
-    install_requires=['URLObject>=0.6.0'],
+    packages=get_packages('rest_framework'),
+    package_data=get_package_data('rest_framework'),
+    test_suite='rest_framework.runtests.runcoverage.main',
+    install_requires=[],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',