Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

README.md

@@ -48,48 +48,51 @@ Let's take a look at a quick example of using REST framework to build a simple m
 
 Here's our project's root `urls.py` module:
 
-    from django.conf.urls.defaults import url, patterns, include
+```python
-    from django.contrib.auth.models import User, Group
+from django.conf.urls.defaults import url, patterns, include
-    from rest_framework import viewsets, routers
+from django.contrib.auth.models import User, Group
+from rest_framework import viewsets, routers
 
-    # ViewSets define the view behavior.
+# ViewSets define the view behavior.
-    class UserViewSet(viewsets.ModelViewSet):
+class UserViewSet(viewsets.ModelViewSet):
-        model = User
+    model = User
 
-    class GroupViewSet(viewsets.ModelViewSet):
+class GroupViewSet(viewsets.ModelViewSet):
-        model = Group
+    model = Group
 
     
-    # Routers provide an easy way of automatically determining the URL conf
+# Routers provide an easy way of automatically determining the URL conf
-    router = routers.DefaultRouter()
+router = routers.DefaultRouter()
-    router.register(r'users', UserViewSet)
+router.register(r'users', UserViewSet)
-    router.register(r'groups', GroupViewSet)
+router.register(r'groups', GroupViewSet)
 
 
-    # Wire up our API using automatic URL routing.
+# Wire up our API using automatic URL routing.
-    # Additionally, we include login URLs for the browseable API.
+# Additionally, we include login URLs for the browseable API.
-    urlpatterns = patterns('',
+urlpatterns = patterns('',
-        url(r'^', include(router.urls)),
+    url(r'^', include(router.urls)),
-        url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
+    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
-    )
+)
+```
 
 We'd also like to configure a couple of settings for our API.
 
 Add the following to your `settings.py` module:
 
-    REST_FRAMEWORK = {
+```python
-        # Use hyperlinked styles by default.
+REST_FRAMEWORK = {
-        # Only used if the `serializer_class` attribute is not set on a view.
+    # Use hyperlinked styles by default.
-        'DEFAULT_MODEL_SERIALIZER_CLASS':
+    # Only used if the `serializer_class` attribute is not set on a view.
-            'rest_framework.serializers.HyperlinkedModelSerializer',
+    'DEFAULT_MODEL_SERIALIZER_CLASS':
-
+        'rest_framework.serializers.HyperlinkedModelSerializer',
-        # Use Django's standard `django.contrib.auth` permissions,
-        # or allow read-only access for unauthenticated users.
-        'DEFAULT_PERMISSION_CLASSES': [
-            'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly'
-        ]
-    }
 
+    # Use Django's standard `django.contrib.auth` permissions,
+    # or allow read-only access for unauthenticated users.
+    'DEFAULT_PERMISSION_CLASSES': [
+        'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly'
+    ]
+}
+```
 Don't forget to make sure you've also added `rest_framework` to your `INSTALLED_APPS` setting.
 
 That's it, we're done!

setup.cfg

@@ -0,0 +1,2 @@
+[wheel]
+universal = 1

setup.py

@@ -45,6 +45,7 @@ version = get_version('rest_framework')
 
 if sys.argv[-1] == 'publish':
     os.system("python setup.py sdist upload")
+    os.system("python setup.py bdist_wheel upload")
     print("You probably want to also tag the version now:")
     print("  git tag -a %s -m 'version %s'" % (version, version))
     print("  git push --tags")