Merge remote-tracking branch 'origin/dev' into dev

[wolnelektury.git] / src / catalogue / __init__.py

diff --git a/src/catalogue/__init__.py b/src/catalogue/__init__.py
index eaeb7d4..16c1326 100644 (file)
--- a/src/catalogue/__init__.py
+++ b/src/catalogue/__init__.py
@@ -14,7 +14,7 @@ class Settings(AppSettings):
     """Default settings for catalogue app."""
     DEFAULT_LANGUAGE = u'pol'
     # PDF needs TeXML + XeLaTeX, MOBI needs Calibre.
-    DONT_BUILD = set(['pdf', 'mobi'])
+    DONT_BUILD = {'pdf', 'mobi'}
     FORMAT_ZIPS = {
             'epub': 'wolnelektury_pl_epub',
             'pdf': 'wolnelektury_pl_pdf',
@@ -23,15 +23,14 @@ class Settings(AppSettings):
         }
 
     REDAKCJA_URL = "http://redakcja.wolnelektury.pl"
-    GOOD_LICENSES = set([r'CC BY \d\.\d', r'CC BY-SA \d\.\d'])
+    GOOD_LICENSES = {r'CC BY \d\.\d', r'CC BY-SA \d\.\d'}
     RELATED_RANDOM_PICTURE_CHANCE = .5
 
     def _more_DONT_BUILD(self, value):
         for format_ in ['cover', 'pdf', 'epub', 'mobi', 'fb2', 'txt']:
             attname = 'NO_BUILD_%s' % format_.upper()
             if hasattr(settings, attname):
-                logging.warn("%s is deprecated, "
-                        "use CATALOGUE_DONT_BUILD instead", attname)
+                logging.warn("%s is deprecated, use CATALOGUE_DONT_BUILD instead", attname)
                 if getattr(settings, attname):
                     value.add(format_)
                 else:
@@ -42,9 +41,7 @@ class Settings(AppSettings):
         for format_ in ['epub', 'pdf', 'mobi', 'fb2']:
             attname = 'ALL_%s_ZIP' % format_.upper()
             if hasattr(settings, attname):
-                logging.warn("%s is deprecated, "
-                        "use CATALOGUE_FORMAT_ZIPS[%s] instead",
-                            attname, format_)
+                logging.warn("%s is deprecated, use CATALOGUE_FORMAT_ZIPS[%s] instead", attname, format_)
                 value[format_] = getattr(settings, attname)
         return value