Merge branch 'master' of https://github.com/chfw/django-excel

Author: chfw

polls/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import Question, Choice
+from polls.models import Question, Choice
 # Register your models here.
 admin.site.register(Question)
 admin.site.register(Choice)

polls/views.py

@@ -55,7 +55,6 @@ def import_data(request):
     if request.method == "POST":
         form = UploadFileForm(request.POST, request.FILES)
         def choice_func(row):
-            print row[0]
             q = Question.objects.filter(slug=row[0])[0]
             row[0] = q
             return row