Upgrade autocomplete a reversion, padá import urls

galerie/admin.py

@@ -5,7 +5,7 @@ from django.contrib import admin
 from django.http import HttpResponseRedirect
 from django import forms
 from django.db import models
-import autocomplete_light
+from autocomplete_light import shortcuts as autocomplete_light
 
 # akction
 

galerie/autocomplete_light_registry.py

@@ -2,7 +2,7 @@
 
 from __future__ import unicode_literals
 
-import autocomplete_light
+from autocomplete_light import shortcuts as autocomplete_light
 
 from models import Obrazek, Galerie
 from views import cesta_od_korene

korektury/models.py

@@ -23,7 +23,7 @@ from django_countries.fields import CountryField
 from solo.models import SingletonModel
 from taggit.managers import TaggableManager
 
-import reversion
+from reversion import revisions as reversion
 
 # PrilohaReseni method
 def generate_filename(self, filename):

requirements.txt

@@ -1,48 +1,48 @@
 # basic libs
 
-psycopg2==2.6.1
-html5lib==0.9999999
-ipython==4.0.0
-Pillow==2.9.0
-pytz==2014.10
-six==1.9.0
-pexpect==3.3
-traitlets==4.0.0
+psycopg2
+html5lib
+ipython
+Pillow
+pytz
+six
+pexpect
+traitlets
 
 # Django and modules
 
-Django==1.7.10 # Updatable to 1.9 (possibly incompatible)
-django-bootstrap-sass==0.0.6a0
-django-mptt==0.7.3
-django-reversion==1.9.3
-django-sekizai==0.8.1
-django-countries==3.2
-django-solo==1.1.0
-django-ckeditor==4.4.7 # Updatable to 5.0 (some incompatible changes)
-django-flat-theme==0.9.3
-django-taggit==0.17
-django-autocomplete-light==2.2.6
-django-crispy-forms==1.4.0
-django-imagekit==3.2.7
+Django
+django-bootstrap-sass
+django-mptt
+django-reversion
+django-sekizai
+django-countries
+django-solo
+django-ckeditor
+django-flat-theme
+django-taggit
+django-autocomplete-light
+django-crispy-forms
+django-imagekit
 
 # Comments
-akismet==0.2.0
-django-fluent-comments==1.0.2
-django-threadedcomments==1.0b1
-django-contrib-comments==1.6.1
+akismet
+django-fluent-comments
+django-threadedcomments
+django-contrib-comments
 
 # debug tools/extensions
 
-django-debug-toolbar==1.4
-django-extensions==1.5.6
-sqlparse==0.1.16
-Werkzeug==0.10.4
+django-debug-toolbar
+django-extensions
+sqlparse
+Werkzeug
 
 # G+, FB authorisation
 
-# django-allauth==0.19.1
-# oauthlib==0.7.2
-# python-openid==2.2.5
-# requests==2.5.3
-# requests-oauthlib==0.4.2
+# django-allauth
+# oauthlib
+# python-openid
+# requests
+# requests-oauthlib
 

seminar/admin.py

@@ -12,7 +12,7 @@ from django.db import models
 from django.contrib.auth.models import User
 
 from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Novinky, Organizator
-import autocomplete_light
+from autocomplete_light import shortcuts as autocomplete_light
 
 
 class UserModelChoiceField(forms.ModelChoiceField):

seminar/autocomplete_light_registry.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import autocomplete_light
+from autocomplete_light import shortcuts as autocomplete_light
 
 from models import Skola, Resitel, Problem, Organizator
 from taggit.models import Tag

seminar/models.py

@@ -24,7 +24,7 @@ from django_countries.fields import CountryField
 from solo.models import SingletonModel
 from taggit.managers import TaggableManager
 
-import reversion
+from reversion import revisions as reversion
 
 from seminar.utils import roman
 

seminar/tools.py

@@ -2,7 +2,7 @@
 
 import logging as log
 from .models import Resitel
-import reversion
+from reversion import revisions as reversion
 
 def merge_props(r1, r2, prop, pretend=True, smaller=False, equal=True):
     """Merge r2.`prop` into r1.`prop`.