Upgrades and removals.

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

diff --git a/src/catalogue/__init__.py b/src/catalogue/__init__.py
index da120b5..e879862 100644 (file)
--- a/src/catalogue/__init__.py
+++ b/src/catalogue/__init__.py
@@ -15,40 +15,12 @@ class Settings(AppSettings):
     DEFAULT_LANGUAGE = 'pol'
     # PDF needs TeXML + XeLaTeX, MOBI needs Calibre.
     DONT_BUILD = {'pdf', 'mobi'}
     DEFAULT_LANGUAGE = 'pol'
     # PDF needs TeXML + XeLaTeX, MOBI needs Calibre.
     DONT_BUILD = {'pdf', 'mobi'}

-    FORMAT_ZIPS = {
-        'epub': 'wolnelektury_pl_epub',
-        'pdf': 'wolnelektury_pl_pdf',
-        'mobi': 'wolnelektury_pl_mobi',
-        'fb2': 'wolnelektury_pl_fb2',
-    }

 
     REDAKCJA_URL = "http://redakcja.wolnelektury.pl"
     GOOD_LICENSES = {r'CC BY \d\.\d', r'CC BY-SA \d\.\d'}
     RELATED_RANDOM_PICTURE_CHANCE = .5
     GET_MP3_LENGTH = 'catalogue.utils.get_mp3_length'
 
 
     REDAKCJA_URL = "http://redakcja.wolnelektury.pl"
     GOOD_LICENSES = {r'CC BY \d\.\d', r'CC BY-SA \d\.\d'}
     RELATED_RANDOM_PICTURE_CHANCE = .5
     GET_MP3_LENGTH = 'catalogue.utils.get_mp3_length'
 

-    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)
-                if getattr(settings, attname):
-                    value.add(format_)
-                else:
-                    value.remove(format_)
-        return value
-
-    def _more_FORMAT_ZIPS(self, value):
-        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_
-                )
-                value[format_] = getattr(settings, attname)
-        return value
-

     def _more_GET_MP3_LENGTH(self, value):
         return import_string(value)
 
     def _more_GET_MP3_LENGTH(self, value):
         return import_string(value)