Cleaning: timezone issues, deprecated urls.py imports, missing notes.

diff --git a/apps/ajaxable/__init__.py b/apps/ajaxable/__init__.py
index a010543..ffa3788 100644 (file)
--- a/apps/ajaxable/__init__.py
+++ b/apps/ajaxable/__init__.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 """
 Provides a way to create forms behaving correctly as AJAX forms
 as well as standalone forms without any Javascript.
 """
 Provides a way to create forms behaving correctly as AJAX forms
 as well as standalone forms without any Javascript.

diff --git a/apps/ajaxable/templatetags/ajaxable_tags.py b/apps/ajaxable/templatetags/ajaxable_tags.py
index 2290478..351e9f1 100644 (file)
--- a/apps/ajaxable/templatetags/ajaxable_tags.py
+++ b/apps/ajaxable/templatetags/ajaxable_tags.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django import template
 from ajaxable.utils import placeholdized
 register = template.Library()
 from django import template
 from ajaxable.utils import placeholdized
 register = template.Library()

diff --git a/apps/ajaxable/utils.py b/apps/ajaxable/utils.py
index 2f03309..0c8fcd4 100755 (executable)
--- a/apps/ajaxable/utils.py
+++ b/apps/ajaxable/utils.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from functools import wraps
 
 from django.http import (HttpResponse, HttpResponseRedirect,
 from functools import wraps
 
 from django.http import (HttpResponse, HttpResponseRedirect,

diff --git a/apps/api/handlers.py b/apps/api/handlers.py
index b436024..c118d95 100644 (file)
--- a/apps/api/handlers.py
+++ b/apps/api/handlers.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 # -*- coding: utf-8 -*-
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.

-
+#

 from datetime import datetime, timedelta
 import json
 from urlparse import urljoin
 from datetime import datetime, timedelta
 import json
 from urlparse import urljoin


@@ -10,6 +10,7 @@ from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.cache import get_cache
 from django.core.urlresolvers import reverse
 from django.contrib.sites.models import Site
 from django.core.cache import get_cache
 from django.core.urlresolvers import reverse

+from django.utils.timezone import utc

 from piston.handler import AnonymousBaseHandler, BaseHandler
 from piston.utils import rc
 from sorl.thumbnail import default
 from piston.handler import AnonymousBaseHandler, BaseHandler
 from piston.utils import rc
 from sorl.thumbnail import default


@@ -21,6 +22,7 @@ from catalogue.models import Book, Tag, BookMedia, Fragment, Collection
 from catalogue.utils import related_tag_name
 from picture.models import Picture
 from picture.forms import PictureImportForm
 from catalogue.utils import related_tag_name
 from picture.models import Picture
 from picture.forms import PictureImportForm

+from wolnelektury.utils import tz

 
 from stats.utils import piwik_track
 
 
 from stats.utils import piwik_track
 


@@ -466,7 +468,7 @@ class CatalogueHandler(BaseHandler):
         """
         # set to five minutes ago, to avoid concurrency issues
         if t is None:
         """
         # set to five minutes ago, to avoid concurrency issues
         if t is None:

-            t = datetime.now() - timedelta(seconds=settings.API_WAIT)
+            t = datetime.utcnow().replace(tzinfo=utc) - timedelta(seconds=settings.API_WAIT)

         # set to whole second in case DB supports something smaller
         return t.replace(microsecond=0)
 
         # set to whole second in case DB supports something smaller
         return t.replace(microsecond=0)
 


@@ -537,7 +539,7 @@ class CatalogueHandler(BaseHandler):
 
     @classmethod
     def book_changes(cls, request=None, since=0, until=None, fields=None):
 
     @classmethod
     def book_changes(cls, request=None, since=0, until=None, fields=None):

-        since = datetime.fromtimestamp(int(since))
+        since = datetime.fromtimestamp(int(since), tz)

         until = cls.until(until)
 
         changes = {
         until = cls.until(until)
 
         changes = {


@@ -603,7 +605,7 @@ class CatalogueHandler(BaseHandler):
 
     @classmethod
     def tag_changes(cls, request=None, since=0, until=None, fields=None, categories=None):
 
     @classmethod
     def tag_changes(cls, request=None, since=0, until=None, fields=None, categories=None):

-        since = datetime.fromtimestamp(int(since))
+        since = datetime.fromtimestamp(int(since), tz)

         until = cls.until(until)
 
         changes = {
         until = cls.until(until)
 
         changes = {

diff --git a/apps/api/helpers.py b/apps/api/helpers.py
index acb491a..62578e7 100644 (file)
--- a/apps/api/helpers.py
+++ b/apps/api/helpers.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from time import mktime
 from piston.resource import Resource
 
 from time import mktime
 from piston.resource import Resource
 

diff --git a/apps/api/settings.py b/apps/api/settings.py
index 2e02e41..0802c54 100644 (file)
--- a/apps/api/settings.py
+++ b/apps/api/settings.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import os.path
 from django.conf import settings
 
 import os.path
 from django.conf import settings
 

diff --git a/apps/api/tests.py b/apps/api/tests.py
index 518a3e2..b72af1b 100644 (file)
--- a/apps/api/tests.py
+++ b/apps/api/tests.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from os import path
 
 from django.core.files.uploadedfile import SimpleUploadedFile
 from os import path
 
 from django.core.files.uploadedfile import SimpleUploadedFile

diff --git a/apps/api/urls.py b/apps/api/urls.py
index a2e3197..0267ba0 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-from django.conf.urls.defaults import *
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf.urls import patterns, url

 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 from piston.authentication import OAuthAuthentication, oauth_access_token 
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 from piston.authentication import OAuthAuthentication, oauth_access_token 

diff --git a/apps/catalogue/tests/__init__.py b/apps/catalogue/tests/__init__.py
index 17a05b4..9c7a77c 100644 (file)
--- a/apps/catalogue/tests/__init__.py
+++ b/apps/catalogue/tests/__init__.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from catalogue.tests.book_import import *
 from catalogue.tests.bookmedia import *
 from catalogue.tests.cover import *
 from catalogue.tests.book_import import *
 from catalogue.tests.bookmedia import *
 from catalogue.tests.cover import *

diff --git a/apps/catalogue/tests/book_import.py b/apps/catalogue/tests/book_import.py
index 76061d0..0d4f470 100644 (file)
--- a/apps/catalogue/tests/book_import.py
+++ b/apps/catalogue/tests/book_import.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.conf import settings
 
 from django.core.files.base import ContentFile, File
 from django.conf import settings
 
 from django.core.files.base import ContentFile, File

diff --git a/apps/catalogue/tests/bookmedia.py b/apps/catalogue/tests/bookmedia.py
index da427e8..0c015f2 100644 (file)
--- a/apps/catalogue/tests/bookmedia.py
+++ b/apps/catalogue/tests/bookmedia.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.conf import settings
 from os.path import basename, exists, join, dirname
 from django.core.files.base import ContentFile, File
 from django.conf import settings
 from os.path import basename, exists, join, dirname
 from django.core.files.base import ContentFile, File

diff --git a/apps/catalogue/tests/cover.py b/apps/catalogue/tests/cover.py
index 765c56b..b73b387 100755 (executable)
--- a/apps/catalogue/tests/cover.py
+++ b/apps/catalogue/tests/cover.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.core.files.base import ContentFile
 from catalogue.test_utils import BookInfoStub, PersonStub, info_args, WLTestCase
 from catalogue.models import Book
 from django.core.files.base import ContentFile
 from catalogue.test_utils import BookInfoStub, PersonStub, info_args, WLTestCase
 from catalogue.models import Book

diff --git a/apps/catalogue/tests/search.py b/apps/catalogue/tests/search.py
index 93bec87..77afae4 100644 (file)
--- a/apps/catalogue/tests/search.py
+++ b/apps/catalogue/tests/search.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from catalogue import models, views
 from catalogue.test_utils import *
 
 from catalogue import models, views
 from catalogue.test_utils import *
 

diff --git a/apps/catalogue/tests/tags.py b/apps/catalogue/tests/tags.py
index c3d50e2..503b98b 100644 (file)
--- a/apps/catalogue/tests/tags.py
+++ b/apps/catalogue/tests/tags.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.core.files.base import ContentFile
 from django.test import Client
 from catalogue import models
 from django.core.files.base import ContentFile
 from django.test import Client
 from catalogue import models

diff --git a/apps/catalogue/tests/templatetags.py b/apps/catalogue/tests/templatetags.py
index 7a2ac36..a66d604 100644 (file)
--- a/apps/catalogue/tests/templatetags.py
+++ b/apps/catalogue/tests/templatetags.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from catalogue import models
 from catalogue.templatetags import catalogue_tags
 from catalogue.test_utils import *
 from catalogue import models
 from catalogue.templatetags import catalogue_tags
 from catalogue.test_utils import *

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index 5392858..7b1fb3d 100644 (file)
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -2,7 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 from django.db.models import Max
 from django.views.generic import ListView, RedirectView
 from catalogue.feeds import AudiobookFeed
 from django.db.models import Max
 from django.views.generic import ListView, RedirectView
 from catalogue.feeds import AudiobookFeed

diff --git a/apps/dictionary/urls.py b/apps/dictionary/urls.py
index 1a33af9..63e4bbd 100755 (executable)
--- a/apps/dictionary/urls.py
+++ b/apps/dictionary/urls.py
@@ -2,7 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 from dictionary.views import NotesView
 
 urlpatterns = patterns('dictionary.views',
 from dictionary.views import NotesView
 
 urlpatterns = patterns('dictionary.views',

diff --git a/apps/funding/models.py b/apps/funding/models.py
index ba14947..1eff8b4 100644 (file)
--- a/apps/funding/models.py
+++ b/apps/funding/models.py
@@ -9,6 +9,7 @@ from django.core.mail import send_mail
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.db import models
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.db import models

+from django.utils.timezone import utc

 from django.utils.translation import ugettext_lazy as _, ugettext, override
 import getpaid
 from catalogue.models import Book
 from django.utils.translation import ugettext_lazy as _, ugettext, override
 import getpaid
 from catalogue.models import Book


@@ -148,7 +149,7 @@ class Offer(models.Model):
                 'remaining': self.remaining(),
                 'current': self.current(),
             })
                 'remaining': self.remaining(),
                 'current': self.current(),
             })

-        self.notified_end = datetime.now()
+        self.notified_end = datetime.utcnow().replace(tzinfo=utc)

         self.save()
 
     def notify_near(self, force=False):
         self.save()
 
     def notify_near(self, force=False):


@@ -165,7 +166,7 @@ class Offer(models.Model):
                 'sum': sum_,
                 'need': need,
             })
                 'sum': sum_,
                 'need': need,
             })

-        self.notified_near = datetime.now()
+        self.notified_near = datetime.utcnow().replace(tzinfo=utc)

         self.save()
 
     def notify_published(self):
         self.save()
 
     def notify_published(self):


@@ -273,7 +274,7 @@ class Funding(models.Model):
         with override(self.language_code or app_settings.DEFAULT_LANGUAGE):
             send_mail(subject,
                 render_to_string(template_name, context),
         with override(self.language_code or app_settings.DEFAULT_LANGUAGE):
             send_mail(subject,
                 render_to_string(template_name, context),

-                getattr(settings, 'CONTACT_EMAIL', 'wolnelektury@nowoczesnapolska.org.pl'),
+                settings.CONTACT_EMAIL,

                 [self.email],
                 fail_silently=False
             )
                 [self.email],
                 fail_silently=False
             )


@@ -317,7 +318,7 @@ getpaid.signals.user_data_query.connect(user_data_query_listener)
 def payment_status_changed_listener(sender, instance, old_status, new_status, **kwargs):
     """ React to status changes from getpaid. """
     if old_status != 'paid' and new_status == 'paid':
 def payment_status_changed_listener(sender, instance, old_status, new_status, **kwargs):
     """ React to status changes from getpaid. """
     if old_status != 'paid' and new_status == 'paid':

-        instance.order.payed_at = datetime.now()
+        instance.order.payed_at = datetime.utcnow().replace(tzinfo=utc)

         instance.order.save()
         if instance.order.email:
             instance.order.notify(
         instance.order.save()
         if instance.order.email:
             instance.order.notify(

diff --git a/apps/funding/templatetags/funding_tags.py b/apps/funding/templatetags/funding_tags.py
index f59a796..0d6064f 100755 (executable)
--- a/apps/funding/templatetags/funding_tags.py
+++ b/apps/funding/templatetags/funding_tags.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django import template
 from ..models import Offer
 from ..utils import sanitize_payment_title
 from django import template
 from ..models import Offer
 from ..utils import sanitize_payment_title

diff --git a/apps/funding/utils.py b/apps/funding/utils.py
index 2b5f58f..ff6e9f4 100644 (file)
--- a/apps/funding/utils.py
+++ b/apps/funding/utils.py
@@ -1,4 +1,7 @@
-# -*- coding: utf-8
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import re
 import string
 from fnpdjango.utils.text.slughifi import char_map
 import re
 import string
 from fnpdjango.utils.text.slughifi import char_map

diff --git a/apps/infopages/admin.py b/apps/infopages/admin.py
index e5bc93c..14a06af 100644 (file)
--- a/apps/infopages/admin.py
+++ b/apps/infopages/admin.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.contrib import admin
 
 from modeltranslation.admin import TranslationAdmin
 from django.contrib import admin
 
 from modeltranslation.admin import TranslationAdmin


@@ -6,4 +10,4 @@ from infopages.models import InfoPage
 class InfoPageAdmin(TranslationAdmin):
     list_display = ('title', 'slug', 'main_page')
 
 class InfoPageAdmin(TranslationAdmin):
     list_display = ('title', 'slug', 'main_page')
 

-admin.site.register(InfoPage, InfoPageAdmin)
\ No newline at end of file
+admin.site.register(InfoPage, InfoPageAdmin)

diff --git a/apps/infopages/urls.py b/apps/infopages/urls.py
index 081e0ef..206f7cb 100755 (executable)
--- a/apps/infopages/urls.py
+++ b/apps/infopages/urls.py
@@ -2,7 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 
 
 urlpatterns = patterns('infopages.views',
 
 
 urlpatterns = patterns('infopages.views',

diff --git a/apps/lesmianator/__init__.py b/apps/lesmianator/__init__.py
index 0932a1c..f3aa78c 100644 (file)
--- a/apps/lesmianator/__init__.py
+++ b/apps/lesmianator/__init__.py
@@ -1,4 +1,8 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+

 # Leśmianator do działania wymaga pliku dictionary.p w katalogu aplikacji
 # plik ten powinien zawierać słownik postaci:
 # <3-znakowy ciąg> => <kolejny znak> => <częstość występowania> 
 # Leśmianator do działania wymaga pliku dictionary.p w katalogu aplikacji
 # plik ten powinien zawierać słownik postaci:
 # <3-znakowy ciąg> => <kolejny znak> => <częstość występowania> 

diff --git a/apps/lesmianator/models.py b/apps/lesmianator/models.py
index 7fceda2..b462dca 100644 (file)
--- a/apps/lesmianator/models.py
+++ b/apps/lesmianator/models.py
@@ -10,6 +10,7 @@ from StringIO import StringIO
 from django.core.files.base import ContentFile
 from django.db import models
 from django.db.models import permalink
 from django.core.files.base import ContentFile
 from django.db import models
 from django.db.models import permalink

+from django.utils.timezone import utc

 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.db.models.signals import m2m_changed
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.db.models.signals import m2m_changed


@@ -40,7 +41,7 @@ class Poem(models.Model):
 
     def visit(self):
         self.view_count += 1
 
     def visit(self):
         self.view_count += 1

-        self.seen_at = datetime.now()
+        self.seen_at = datetime.utcnow().replace(tzinfo=utc)

         self.save()
 
     def __unicode__(self):
         self.save()
 
     def __unicode__(self):

diff --git a/apps/lesmianator/urls.py b/apps/lesmianator/urls.py
index de48644..1770140 100644 (file)
--- a/apps/lesmianator/urls.py
+++ b/apps/lesmianator/urls.py
@@ -2,8 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
-from catalogue.models import Book
+from django.conf.urls import url, patterns

 
 urlpatterns = patterns('lesmianator.views',
     url(r'^$', 'main_page', name='lesmianator'),
 
 urlpatterns = patterns('lesmianator.views',
     url(r'^$', 'main_page', name='lesmianator'),

diff --git a/apps/lesmianator/views.py b/apps/lesmianator/views.py
index 7b289b7..e74d21f 100644 (file)
--- a/apps/lesmianator/views.py
+++ b/apps/lesmianator/views.py
@@ -1,5 +1,7 @@
-# Create your views here.
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.http import Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.http import Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext

diff --git a/apps/libraries/admin.py b/apps/libraries/admin.py
index 5fa88df..5629e93 100644 (file)
--- a/apps/libraries/admin.py
+++ b/apps/libraries/admin.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-\r
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.\r
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.\r
+#\r

 from django.contrib import admin\r
 \r
 from libraries.models import Library, Catalog\r
 from django.contrib import admin\r
 \r
 from libraries.models import Library, Catalog\r

diff --git a/apps/libraries/models.py b/apps/libraries/models.py
index 5f92421..96473eb 100644 (file)
--- a/apps/libraries/models.py
+++ b/apps/libraries/models.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-\r
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.\r
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.\r
+#\r

 from django.db import models\r
 from django.utils.translation import ugettext_lazy as _\r
 \r
 from django.db import models\r
 from django.utils.translation import ugettext_lazy as _\r
 \r


@@ -38,4 +42,4 @@ class Library(models.Model):
 \r
     @models.permalink\r
     def get_absolute_url(self):\r
 \r
     @models.permalink\r
     def get_absolute_url(self):\r

-        return ('libraries_library_view', [self.catalog.slug, self.slug])
\ No newline at end of file
+        return ('libraries_library_view', [self.catalog.slug, self.slug])\r

diff --git a/apps/libraries/urls.py b/apps/libraries/urls.py
index 01531a9..93d605d 100644 (file)
--- a/apps/libraries/urls.py
+++ b/apps/libraries/urls.py
@@ -1,4 +1,8 @@
-from django.conf.urls.defaults import patterns, url
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf.urls import patterns, url

 from django.http import HttpResponseRedirect
 
 
 from django.http import HttpResponseRedirect
 
 


@@ -7,4 +11,4 @@ urlpatterns = patterns('libraries.views',
     url(r'^/$', lambda x: HttpResponseRedirect(x.path[:-1])),
     url(r'^/(?P<slug>[a-zA-Z0-9_-]+)$', 'catalog_view', name='libraries_catalog_view'),
     url(r'^/(?P<catalog_slug>[a-zA-Z0-9_-]+)/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='libraries_library_view'),
     url(r'^/$', lambda x: HttpResponseRedirect(x.path[:-1])),
     url(r'^/(?P<slug>[a-zA-Z0-9_-]+)$', 'catalog_view', name='libraries_catalog_view'),
     url(r'^/(?P<catalog_slug>[a-zA-Z0-9_-]+)/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='libraries_library_view'),

-)
\ No newline at end of file
+)

diff --git a/apps/libraries/views.py b/apps/libraries/views.py
index f79f2a1..83ab6b1 100644 (file)
--- a/apps/libraries/views.py
+++ b/apps/libraries/views.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-\r
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.\r
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.\r
+#\r

 from django.shortcuts import render_to_response, get_object_or_404\r
 from django.template import RequestContext, Template, TemplateSyntaxError\r
 \r
 from django.shortcuts import render_to_response, get_object_or_404\r
 from django.template import RequestContext, Template, TemplateSyntaxError\r
 \r


@@ -17,4 +21,4 @@ def catalog_view(request, slug):
 def library_view(request, catalog_slug, slug):\r
     context = RequestContext(request)\r
     context['library'] = get_object_or_404(Library.objects.filter(slug = slug).filter(catalog__slug = catalog_slug))\r
 def library_view(request, catalog_slug, slug):\r
     context = RequestContext(request)\r
     context['library'] = get_object_or_404(Library.objects.filter(slug = slug).filter(catalog__slug = catalog_slug))\r

-    return render_to_response('libraries/library_view.html', context_instance = context)
\ No newline at end of file
+    return render_to_response('libraries/library_view.html', context_instance = context)\r

diff --git a/apps/modeltranslation/testurls.py b/apps/modeltranslation/testurls.py
index 8cb4d86..a789ee3 100644 (file)
--- a/apps/modeltranslation/testurls.py
+++ b/apps/modeltranslation/testurls.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 
 urlpatterns = patterns('',
     url(r'^set_language/$', 'django.views.i18n.set_language', {},
 
 urlpatterns = patterns('',
     url(r'^set_language/$', 'django.views.i18n.set_language', {},

diff --git a/apps/oai/handlers.py b/apps/oai/handlers.py
index 4e3fefc..142b81f 100644 (file)
--- a/apps/oai/handlers.py
+++ b/apps/oai/handlers.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from oaipmh import server, common, metadata, error
 from catalogue.models import Book, Tag
 from api.models import Deleted
 from oaipmh import server, common, metadata, error
 from catalogue.models import Book, Tag
 from api.models import Deleted

diff --git a/apps/oai/tests/__init__.py b/apps/oai/tests/__init__.py
index 08a39d7..561ef60 100644 (file)
--- a/apps/oai/tests/__init__.py
+++ b/apps/oai/tests/__init__.py
@@ -1 +1,5 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from oai.tests.oaipmhapi import *
 from oai.tests.oaipmhapi import *

diff --git a/apps/oai/tests/oaipmhapi.py b/apps/oai/tests/oaipmhapi.py
index b4947fe..15f3ff3 100644 (file)
--- a/apps/oai/tests/oaipmhapi.py
+++ b/apps/oai/tests/oaipmhapi.py
@@ -1,5 +1,7 @@
-
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from catalogue.test_utils import WLTestCase
 from catalogue import models
 from nose.tools import raises
 from catalogue.test_utils import WLTestCase
 from catalogue import models
 from nose.tools import raises

diff --git a/apps/oai/urls.py b/apps/oai/urls.py
index 406209f..13ea9f1 100644 (file)
--- a/apps/oai/urls.py
+++ b/apps/oai/urls.py
@@ -1,5 +1,8 @@
-
-from django.conf.urls.defaults import *
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf.urls import patterns, url

 
 urlpatterns = patterns('oai.views',
                        url(r'^$', 'oaipmh', name='oaipmh'))
 
 urlpatterns = patterns('oai.views',
                        url(r'^$', 'oaipmh', name='oaipmh'))

diff --git a/apps/oai/views.py b/apps/oai/views.py
index 5ef5bd4..7155d69 100644 (file)
--- a/apps/oai/views.py
+++ b/apps/oai/views.py
@@ -1,4 +1,7 @@
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from oai.handlers import Catalogue, NS_DCTERMS, nsdcterms
 from oaipmh.server import ServerBase, oai_dc_writer, NS_OAIDC, NS_DC, NS_XSI, nsoaidc, nsdc
 from oaipmh.metadata import MetadataRegistry
 from oai.handlers import Catalogue, NS_DCTERMS, nsdcterms
 from oaipmh.server import ServerBase, oai_dc_writer, NS_OAIDC, NS_DC, NS_XSI, nsoaidc, nsdc
 from oaipmh.metadata import MetadataRegistry

diff --git a/apps/opds/tests/__init__.py b/apps/opds/tests/__init__.py
index 856f2f2..8d51b7b 100755 (executable)
--- a/apps/opds/tests/__init__.py
+++ b/apps/opds/tests/__init__.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from lxml import etree
 from django.core.files.base import ContentFile
 import catalogue
 from lxml import etree
 from django.core.files.base import ContentFile
 import catalogue

diff --git a/apps/opds/urls.py b/apps/opds/urls.py
index 1a316b6..00831f0 100644 (file)
--- a/apps/opds/urls.py
+++ b/apps/opds/urls.py
@@ -2,7 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 from opds.views import RootFeed, ByCategoryFeed, ByTagFeed, UserFeed, UserSetFeed, SearchFeed
 
 
 from opds.views import RootFeed, ByCategoryFeed, ByTagFeed, UserFeed, UserSetFeed, SearchFeed
 
 

diff --git a/apps/pdcounter/templatetags/time_tags.py b/apps/pdcounter/templatetags/time_tags.py
index e454acd..b8cc571 100755 (executable)
--- a/apps/pdcounter/templatetags/time_tags.py
+++ b/apps/pdcounter/templatetags/time_tags.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import datetime
 import pytz
 from django.conf import settings
 import datetime
 import pytz
 from django.conf import settings

diff --git a/apps/picture/admin.py b/apps/picture/admin.py
index fb6bcf2..f107d31 100644 (file)
--- a/apps/picture/admin.py
+++ b/apps/picture/admin.py
@@ -1,4 +1,7 @@
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.contrib import admin
 from picture.models import Picture
 from sorl.thumbnail.admin import AdminImageMixin
 from django.contrib import admin
 from picture.models import Picture
 from sorl.thumbnail.admin import AdminImageMixin

diff --git a/apps/picture/forms.py b/apps/picture/forms.py
index 9d0c5a5..2ad47b0 100644 (file)
--- a/apps/picture/forms.py
+++ b/apps/picture/forms.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from picture.models import Picture
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from picture.models import Picture

diff --git a/apps/picture/models.py b/apps/picture/models.py
index d8783cb..a0179de 100644 (file)
--- a/apps/picture/models.py
+++ b/apps/picture/models.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.db import models, transaction
 import catalogue.models
 from django.db.models import permalink
 from django.db import models, transaction
 import catalogue.models
 from django.db.models import permalink

diff --git a/apps/picture/templatetags/picture_tags.py b/apps/picture/templatetags/picture_tags.py
index 826f6aa..f0949a2 100644 (file)
--- a/apps/picture/templatetags/picture_tags.py
+++ b/apps/picture/templatetags/picture_tags.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django import template
 from django.template import Node, Variable, Template, Context
 from catalogue.utils import split_tags
 from django import template
 from django.template import Node, Variable, Template, Context
 from catalogue.utils import split_tags

diff --git a/apps/picture/tests/__init__.py b/apps/picture/tests/__init__.py
index 8817a1c..b2e50b0 100644 (file)
--- a/apps/picture/tests/__init__.py
+++ b/apps/picture/tests/__init__.py
@@ -1 +1,5 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from picture.tests.picture_import import *
 from picture.tests.picture_import import *

diff --git a/apps/picture/tests/picture_import.py b/apps/picture/tests/picture_import.py
index 68c8753..e1bbd16 100644 (file)
--- a/apps/picture/tests/picture_import.py
+++ b/apps/picture/tests/picture_import.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from __future__ import with_statement
 
 from os import path
 from __future__ import with_statement
 
 from os import path

diff --git a/apps/picture/views.py b/apps/picture/views.py
index 4d5d854..3e471b0 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -1,4 +1,7 @@
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.contrib.auth.decorators import permission_required
 from django.utils.datastructures import SortedDict
 from django.shortcuts import render_to_response, get_object_or_404
 from django.contrib.auth.decorators import permission_required
 from django.utils.datastructures import SortedDict
 from django.shortcuts import render_to_response, get_object_or_404

diff --git a/apps/polls/admin.py b/apps/polls/admin.py
index 29fc0aa..965f6c0 100644 (file)
--- a/apps/polls/admin.py
+++ b/apps/polls/admin.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.contrib import admin
 
 from models import Poll, PollItem
 from django.contrib import admin
 
 from models import Poll, PollItem


@@ -18,4 +22,4 @@ class PollItemAdmin(admin.ModelAdmin):
     
     
 admin.site.register(Poll, PollAdmin)
     
     
 admin.site.register(Poll, PollAdmin)

-admin.site.register(PollItem, PollItemAdmin)
\ No newline at end of file
+admin.site.register(PollItem, PollItemAdmin)

diff --git a/apps/polls/forms.py b/apps/polls/forms.py
index f9ca907..fba3468 100644 (file)
--- a/apps/polls/forms.py
+++ b/apps/polls/forms.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-\r
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.\r
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.\r
+#\r

 from django import forms\r
 \r
 \r
 from django import forms\r
 \r
 \r


@@ -7,4 +11,4 @@ class PollForm(forms.Form):
     def __init__(self, *args, **kwargs):
         poll = kwargs.pop('poll', None)\r
         super(PollForm, self).__init__(*args, **kwargs)\r
     def __init__(self, *args, **kwargs):
         poll = kwargs.pop('poll', None)\r
         super(PollForm, self).__init__(*args, **kwargs)\r

-        self.fields['vote'].choices = [(item.id, item.content) for item in poll.items.all()]
\ No newline at end of file
+        self.fields['vote'].choices = [(item.id, item.content) for item in poll.items.all()]\r

diff --git a/apps/polls/models.py b/apps/polls/models.py
index d63e5aa..16713e4 100644 (file)
--- a/apps/polls/models.py
+++ b/apps/polls/models.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError


@@ -57,4 +61,4 @@ class PollItem(models.Model):
         self.vote_count = self.vote_count + 1
         self.save()
         session.setdefault(USED_POLLS_KEY, set()).add(self.poll.id)
         self.vote_count = self.vote_count + 1
         self.save()
         session.setdefault(USED_POLLS_KEY, set()).add(self.poll.id)

-        session.save()
\ No newline at end of file
+        session.save()

diff --git a/apps/polls/templatetags/polls_tags.py b/apps/polls/templatetags/polls_tags.py
index e69a7ce..d17d309 100644 (file)
--- a/apps/polls/templatetags/polls_tags.py
+++ b/apps/polls/templatetags/polls_tags.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django import template
 from ..forms import PollForm
 
 from django import template
 from ..forms import PollForm
 


@@ -15,4 +19,4 @@ def poll(context, poll, show_results = True, redirect_to = ''):
                 voted_already = voted_already,
                 vote_count = poll.vote_count,
                 show_results = show_results
                 voted_already = voted_already,
                 vote_count = poll.vote_count,
                 show_results = show_results

-           )
\ No newline at end of file
+           )

diff --git a/apps/polls/urls.py b/apps/polls/urls.py
index 87738d5..fcd0ac6 100644 (file)
--- a/apps/polls/urls.py
+++ b/apps/polls/urls.py
@@ -1,4 +1,8 @@
-from django.conf.urls import patterns, url, include
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf.urls import patterns, url

 
 
 urlpatterns = patterns('polls.views',
 
 
 urlpatterns = patterns('polls.views',

diff --git a/apps/polls/views.py b/apps/polls/views.py
index c9cb5de..1dcd387 100644 (file)
--- a/apps/polls/views.py
+++ b/apps/polls/views.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.views.decorators.http import require_http_methods\r
 from django.shortcuts import get_object_or_404, redirect, render_to_response\r
 from django.core.urlresolvers import reverse\r
 from django.views.decorators.http import require_http_methods\r
 from django.shortcuts import get_object_or_404, redirect, render_to_response\r
 from django.core.urlresolvers import reverse\r


@@ -31,4 +35,4 @@ def poll(request, slug):
         return render_to_response('polls/poll.html', context)
         
         \r
         return render_to_response('polls/poll.html', context)
         
         \r

-            
\ No newline at end of file
+            

diff --git a/apps/reporting/urls.py b/apps/reporting/urls.py
index cb59987..e78f961 100755 (executable)
--- a/apps/reporting/urls.py
+++ b/apps/reporting/urls.py
@@ -2,7 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 
 
 urlpatterns = patterns('reporting.views',
 
 
 urlpatterns = patterns('reporting.views',

diff --git a/apps/search/__init__.py b/apps/search/__init__.py
index 8081416..6253c9d 100644 (file)
--- a/apps/search/__init__.py
+++ b/apps/search/__init__.py
@@ -1,2 +1,5 @@
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from index import Index, Search, SearchResult
 from index import Index, Search, SearchResult

diff --git a/apps/search/context_processors.py b/apps/search/context_processors.py
index cfb2f2e..3cb9256 100644 (file)
--- a/apps/search/context_processors.py
+++ b/apps/search/context_processors.py
@@ -1,4 +1,7 @@
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.core.urlresolvers import reverse
 from search.forms import SearchForm
 
 from django.core.urlresolvers import reverse
 from search.forms import SearchForm
 

diff --git a/apps/search/custom.py b/apps/search/custom.py
index dcb55eb..b3b704d 100644 (file)
--- a/apps/search/custom.py
+++ b/apps/search/custom.py
@@ -1,4 +1,7 @@
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from sunburnt import sunburnt
 from lxml import etree
 import urllib
 from sunburnt import sunburnt
 from lxml import etree
 import urllib

diff --git a/apps/search/index.py b/apps/search/index.py
index f9a3c89..7fb60b5 100644 (file)
--- a/apps/search/index.py
+++ b/apps/search/index.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.conf import settings
 
 import os
 from django.conf import settings
 
 import os

diff --git a/apps/search/management/commands/reindex.py b/apps/search/management/commands/reindex.py
index 7032565..4a17acd 100755 (executable)
--- a/apps/search/management/commands/reindex.py
+++ b/apps/search/management/commands/reindex.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import sys
 from django.core.management.base import BaseCommand
 
 import sys
 from django.core.management.base import BaseCommand
 

diff --git a/apps/search/management/commands/snippets.py b/apps/search/management/commands/snippets.py
index 058ea05..7706547 100755 (executable)
--- a/apps/search/management/commands/snippets.py
+++ b/apps/search/management/commands/snippets.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.core.management.base import BaseCommand
 
 from glob import glob
 from django.core.management.base import BaseCommand
 
 from glob import glob

diff --git a/apps/search/tests/__init__.py b/apps/search/tests/__init__.py
index 403c290..80c974e 100644 (file)
--- a/apps/search/tests/__init__.py
+++ b/apps/search/tests/__init__.py
@@ -1 +1,5 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from search.tests.index import *
 from search.tests.index import *

diff --git a/apps/search/tests/index.py b/apps/search/tests/index.py
index 3e3d290..d244a2c 100644 (file)
--- a/apps/search/tests/index.py
+++ b/apps/search/tests/index.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.conf import settings
 from django.test.utils import override_settings
 from catalogue.test_utils import WLTestCase, get_fixture
 from django.conf import settings
 from django.test.utils import override_settings
 from catalogue.test_utils import WLTestCase, get_fixture

diff --git a/apps/search/urls.py b/apps/search/urls.py
index 607f094..695a7e6 100644 (file)
--- a/apps/search/urls.py
+++ b/apps/search/urls.py
@@ -2,7 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 
 urlpatterns = patterns('search.views',
     url(r'^$', 'main', name='search'),
 
 urlpatterns = patterns('search.views',
     url(r'^$', 'main', name='search'),

diff --git a/apps/search/views.py b/apps/search/views.py
index 9a0b469..dc9e27b 100644 (file)
--- a/apps/search/views.py
+++ b/apps/search/views.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.conf import settings
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.conf import settings
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext

diff --git a/apps/social/urls.py b/apps/social/urls.py
index 9e6de00..657b297 100755 (executable)
--- a/apps/social/urls.py
+++ b/apps/social/urls.py
@@ -2,7 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 from social.views import ObjectSetsFormView
 
 urlpatterns = patterns('social.views',
 from social.views import ObjectSetsFormView
 
 urlpatterns = patterns('social.views',

diff --git a/apps/social/utils.py b/apps/social/utils.py
index 00cf43e..43bc029 100755 (executable)
--- a/apps/social/utils.py
+++ b/apps/social/utils.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.db.models import Q
 from catalogue.models import Book, Tag
 from catalogue import utils
 from django.db.models import Q
 from catalogue.models import Book, Tag
 from catalogue import utils

diff --git a/apps/suggest/urls.py b/apps/suggest/urls.py
index ae4ac15..2f70172 100644 (file)
--- a/apps/suggest/urls.py
+++ b/apps/suggest/urls.py
@@ -2,7 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url

 from suggest import views
 
 urlpatterns = patterns('',
 from suggest import views
 
 urlpatterns = patterns('',

diff --git a/apps/waiter/__init__.py b/apps/waiter/__init__.py
index d3696b7..9c83ee3 100644 (file)
--- a/apps/waiter/__init__.py
+++ b/apps/waiter/__init__.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 """
 Celery waiter.
 
 """
 Celery waiter.
 


@@ -5,4 +9,4 @@ Takes orders for files generated by async Celery tasks.
 Serves the file when ready. Kindly asks the user to wait if not.
 
 Author: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
 Serves the file when ready. Kindly asks the user to wait if not.
 
 Author: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>

-"""
\ No newline at end of file
+"""

diff --git a/apps/waiter/models.py b/apps/waiter/models.py
index 10f9289..8b6ff94 100644 (file)
--- a/apps/waiter/models.py
+++ b/apps/waiter/models.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from os.path import join, isfile
 from django.core.urlresolvers import reverse
 from django.db import models
 from os.path import join, isfile
 from django.core.urlresolvers import reverse
 from django.db import models

diff --git a/apps/waiter/settings.py b/apps/waiter/settings.py
index 08e88d3..aaa9f03 100644 (file)
--- a/apps/waiter/settings.py
+++ b/apps/waiter/settings.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from os.path import abspath, join
 from django.conf import settings
 
 from os.path import abspath, join
 from django.conf import settings
 

diff --git a/apps/waiter/tasks.py b/apps/waiter/tasks.py
index 4c3933e..89db402 100644 (file)
--- a/apps/waiter/tasks.py
+++ b/apps/waiter/tasks.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from celery.signals import task_postrun
 from waiter.models import WaitedFile
 
 from celery.signals import task_postrun
 from waiter.models import WaitedFile
 

diff --git a/apps/waiter/urls.py b/apps/waiter/urls.py
index 484ef3e..21352c7 100644 (file)
--- a/apps/waiter/urls.py
+++ b/apps/waiter/urls.py
@@ -1,4 +1,8 @@
-from django.conf.urls.defaults import *
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf.urls import patterns, url

 
 urlpatterns = patterns('waiter.views',
     url(r'^(?P<path>.*)$', 'wait', name='waiter'),
 
 urlpatterns = patterns('waiter.views',
     url(r'^(?P<path>.*)$', 'wait', name='waiter'),

diff --git a/apps/waiter/utils.py b/apps/waiter/utils.py
index 0957e9d..1edc2fa 100644 (file)
--- a/apps/waiter/utils.py
+++ b/apps/waiter/utils.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from os.path import abspath, join, exists
 from shutil import rmtree
 from waiter.settings import WAITER_ROOT
 from os.path import abspath, join, exists
 from shutil import rmtree
 from waiter.settings import WAITER_ROOT

diff --git a/apps/waiter/views.py b/apps/waiter/views.py
index 6e076b3..0892ca9 100644 (file)
--- a/apps/waiter/views.py
+++ b/apps/waiter/views.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from os.path import join
 from waiter.models import WaitedFile
 from waiter.settings import WAITER_URL
 from os.path import join
 from waiter.models import WaitedFile
 from waiter.settings import WAITER_URL

diff --git a/apps/wolnelektury_core/context_processors.py b/apps/wolnelektury_core/context_processors.py
index c912116..5885e03 100644 (file)
--- a/apps/wolnelektury_core/context_processors.py
+++ b/apps/wolnelektury_core/context_processors.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.conf import settings
 
 def extra_settings(request):
 from django.conf import settings
 
 def extra_settings(request):

diff --git a/apps/wolnelektury_core/management/commands/localepack.py b/apps/wolnelektury_core/management/commands/localepack.py
index 4ec7434..26eee83 100644 (file)
--- a/apps/wolnelektury_core/management/commands/localepack.py
+++ b/apps/wolnelektury_core/management/commands/localepack.py
@@ -1,4 +1,7 @@
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from optparse import make_option
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from optparse import make_option
 from django.conf import settings
 from django.core.management.base import BaseCommand

diff --git a/apps/wolnelektury_core/templatetags/common_tags.py b/apps/wolnelektury_core/templatetags/common_tags.py
index ccaf03b..eddf9f1 100644 (file)
--- a/apps/wolnelektury_core/templatetags/common_tags.py
+++ b/apps/wolnelektury_core/templatetags/common_tags.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django import template
 register = template.Library()
 
 from django import template
 register = template.Library()
 

diff --git a/apps/wolnelektury_core/views.py b/apps/wolnelektury_core/views.py
index f2a774b..80156bf 100644 (file)
--- a/apps/wolnelektury_core/views.py
+++ b/apps/wolnelektury_core/views.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from datetime import datetime
 import feedparser
 
 from datetime import datetime
 import feedparser
 

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 6c25451..88f951a 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import os
 
 from django.conf.urls.defaults import *
 import os
 
 from django.conf.urls.defaults import *

diff --git a/wolnelektury/utils.py b/wolnelektury/utils.py
index ad57222..0c256e5 100644 (file)
--- a/wolnelektury/utils.py
+++ b/wolnelektury/utils.py
@@ -1,10 +1,16 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import pytz
 from django.utils import timezone
 from django.conf import settings
 
 import pytz
 from django.utils import timezone
 from django.conf import settings
 

+tz = pytz.timezone(settings.TIME_ZONE)
+

 def localtime_to_utc(localtime):
     return timezone.utc.normalize(
 def localtime_to_utc(localtime):
     return timezone.utc.normalize(

-        pytz.timezone(settings.TIME_ZONE).localize(localtime)
+        tz.localize(localtime)

     )
 
 def utc_for_js(dt):
     )
 
 def utc_for_js(dt):