python3 and django17

axcel · axcel · commit 817bcf22d26b · 2014-06-03T14:39:26.000+06:00
diff --git a/conf/settings.py b/conf/settings.py
@@ -138,12 +138,11 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'bootstrap_admin',
+    'django_admin_bootstrapped',
     'django.contrib.admin',
-    'south',
     'sorl.thumbnail',
     'pytils',
-    "menus",
+    'menus',
     'digest',
     'syncrss',
     'frontend',
diff --git a/digest/models.py b/digest/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from sleekxmpp import ClientXMPP
 from concurrency.fields import IntegerVersionField
 
 from django.conf import settings
@@ -49,7 +48,7 @@ class Issue(models.Model):
     )
     version = IntegerVersionField()
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     class Meta:
@@ -89,7 +88,7 @@ class Section(models.Model):
         null=True, blank=True
     )
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     class Meta:
@@ -116,7 +115,7 @@ class Resource(models.Model):
     )
     version = IntegerVersionField()
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
 
@@ -194,35 +193,9 @@ class Item(models.Model):
     )
     version = IntegerVersionField()
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     class Meta:
         verbose_name = u'Новость'
         verbose_name_plural = u'Новости'
-
-
-#@receiver(post_save, sender=Item)
-#def send_item(instance, **kwargs):
-#    '''
-#    По событию сохранения активной новости отправляет ее в juick
-#    А тот в свою очередь репостит в twitter
-#    '''
-#    if instance.status == 'active':
-#        mess = u'%s %s %s %s' % (
-#            settings.JUICK_TAGS,
-#            instance.title,
-#            instance.link,
-#            instance.description
-#        )
-#        xmpp = ClientXMPP(
-#            settings.JABBER_USER,
-#            settings.JABBER_PASS
-#        )
-#        xmpp.connect()
-
-#        def on_start(e):
-#            xmpp.send_message(mto='juick@juick.com', mbody=mess, mtype='chat')
-#            xmpp.disconnect(wait=True)
-#        xmpp.add_event_handler('session_start', on_start)
-#        xmpp.process()
diff --git a/frontend/templates/top_menu.html b/frontend/templates/top_menu.html
@@ -1,4 +1,3 @@
-{% load menu_item %}
 <div class="masthead">
     <div class="row">
         <div class="col-md-8">
@@ -12,13 +11,19 @@ <h3 class="text-muted">Дайджест новостей из мира Python <a
         </div>
     </div>
     <ul class="nav nav-justified">
-        {% li_menu_item "url:frontend:home" "Главная" %}
-        {% li_menu_item "url:frontend:issues" "Выпуски" %}
-        {% li_menu_item "url:frontend:feed" "Лента" %}
+    	<li>
+    	<a href="{% url "frontend:home" %}">Главная</a>
+	</li>
+	<li>
+	<a href="{% url "frontend:issues" %}">Выпуски</a>
+	</li>
+	<li>
+	<a href="{% url "frontend:feed" %}">Лента</a>
+	</li>
         {% comment %}
         <li>
             <a href="#">О проекте</a>
         </li>
         {% endcomment %}
     </ul>
-</div>
+</div>
diff --git a/frontend/urls.py b/frontend/urls.py
@@ -1,4 +1,4 @@
-from feeds import LatestEntriesFeed
+from .feeds import LatestEntriesFeed
 from django.conf.urls import patterns, url
 
 from frontend.views import (
diff --git a/frontend/views.py b/frontend/views.py
@@ -9,7 +9,7 @@
 from django.views.generic import TemplateView, ListView, DetailView, FormView
 
 
-from forms import AddNewsForm
+from .forms import AddNewsForm
 
 
 class Index(TemplateView):
diff --git a/requirements.txt b/requirements.txt
@@ -1,12 +1,12 @@
-Django==1.5.5
-Pillow==2.3.0
-South==0.8.4
+# django not release yet
+git+git://github.com/django/django.git@1.7b4
+#Django==1.7
+Pillow==2.4.0
 argparse==1.2.1
-bootstrap-admin==0.3.0
+django-admin-bootstrapped
 django-concurrency==0.7.1
-django-digg-paginator==0.0.1
 django-menus==1.1.2
+django-digg-paginator
 pytils==0.3
-sorl-thumbnail==11.12
-wsgiref==0.1.2
+git+git://github.com/mariocesar/sorl-thumbnail.git@v11.12.1b
 feedparser==5.1.3

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from feeds import LatestEntriesFeed`
	`1`	`+from .feeds import LatestEntriesFeed`
`2`	`2`	`from django.conf.urls import patterns, url`
`3`	`3`
`4`	`4`	`from frontend.views import (`