Skip to content

Commit

Permalink
Reordering to match new Repository
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Wackerbarth authored and Richard Wackerbarth committed Jan 16, 2013
1 parent d47b7a2 commit b9144a2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions snippets/models.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from django.db import models
from pygments.lexers import get_all_lexers, get_lexer_by_name
from pygments.lexers import get_all_lexers
from pygments.styles import get_all_styles
from pygments.lexers import get_lexer_by_name
from pygments.formatters import HtmlFormatter
from pygments import highlight

LEXERS = [item for item in get_all_lexers() if item[1]]
LANGUAGE_CHOICES = sorted([(item[1][0], item[0]) for item in LEXERS])
STYLE_CHOICES = sorted((item, item) for item in get_all_styles())


class Snippet(models.Model):
created = models.DateTimeField(auto_now_add=True)
title = models.CharField(max_length=100, default='')
Expand Down
3 changes: 1 addition & 2 deletions snippets/serializers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from rest_framework import serializers
from snippets.models import Snippet
from django.contrib.auth.models import User
from rest_framework import serializers


class SnippetSerializer(serializers.HyperlinkedModelSerializer):
owner = serializers.Field(source='owner.username')
Expand Down
7 changes: 4 additions & 3 deletions snippets/views.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
from rest_framework import generics, permissions, renderers
from django.contrib.auth.models import User
from rest_framework import generics
from rest_framework import permissions
from rest_framework import renderers
from rest_framework.decorators import api_view
from rest_framework.response import Response
from rest_framework.reverse import reverse
from django.contrib.auth.models import User
from snippets.models import Snippet
from snippets.permissions import IsOwnerOrReadOnly
from snippets.serializers import SnippetSerializer, UserSerializer


@api_view(('GET',))
def api_root(request, format=None):
"""
Expand Down
2 changes: 1 addition & 1 deletion tutorial/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'snippets',
'rest_framework',
'snippets',
)

# A sample logging configuration. The only tangible logging
Expand Down

0 comments on commit b9144a2

Please sign in to comment.