BK-2085 Add support for Django 1.11 LTS

Author: ride90

lib/booki/editor/common.py

@@ -15,52 +15,52 @@
 # along with Booktype.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.core.management.base import BaseCommand, CommandError
-from optparse import make_option
 from django.contrib.auth.models import User
 
 from booki.editor import models
+from booktype.utils.book import rename_book
+
 
 class Command(BaseCommand):
-    args = "<book name>"
     help = "Rename book."
+    requires_model_validation = False
+    BOOK_NAME = '<book name>'
 
-    option_list = BaseCommand.option_list + (
-        make_option('--owner',
-                    action='store',
-                    dest='owner',
-                    default=None,
-                    help='Set new owner of the book.'),
-        
-        make_option('--new-book-title',
-                    action='store',
-                    dest='new_book_title',
-                    default=None,
-                    help='Set new book title.'),
+    def add_arguments(self, parser):
+        parser.add_argument(self.BOOK_NAME, nargs=1, type=str)
+        parser.add_argument('--owner',
+                            action='store',
+                            dest='owner',
+                            default=None,
+                            help='Set new owner of the book.')
 
-        make_option('--new-book-url',
-                    action='store',
-                    dest='new_book_url',
-                    default=None,
-                    help='Set new book url name.'),
+        parser.add_argument('--new-book-title',
+                            action='store',
+                            dest='new_book_title',
+                            default=None,
+                            help='Set new book title.')
 
-        )
-
-    requires_model_validation = False
+        parser.add_argument('--new-book-url',
+                            action='store',
+                            dest='new_book_url',
+                            default=None,
+                            help='Set new book url name.')
 
     def handle(self, *args, **options):
-        if len(args) != 1:
+        book_name = options[self.BOOK_NAME][0]
+
+        if not book_name:
             raise CommandError("You must specify book name.")
 
         try:
-            book = models.Book.objects.get(url_title__iexact=args[0])
+            book = models.Book.objects.get(url_title__iexact=book_name)
         except models.Book.DoesNotExist:
-            raise CommandError('Book "%s" does not exist.' % args[0])
+            raise CommandError('Book "%s" does not exist.' % book_name)
 
         if options['new_book_title']:
             book.title = options['new_book_title']
 
         if options['new_book_url']:
-            from booktype.utils.book import rename_book
             rename_book(book,  book.title, options['new_book_url'])
 
         if options['owner']:

lib/booki/editor/management/commands/bookexport.py

@@ -14,19 +14,17 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Booktype.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.core.management.base import BaseCommand, CommandError
-from optparse import make_option
-import os.path
+import os
 import urllib2
-
-from booki.editor import models
 from lxml import etree, html
 
 from django.test import Client
-
+from django.core.management.base import BaseCommand, CommandError
+from booki.editor import models
 
 cacheLinks = {}
 
+
 class HeadRequest(urllib2.Request):
     def get_method(self):
         return "HEAD"
@@ -59,13 +57,14 @@ def checkLink(options, chapter, urlLink):
 
             if not options['no_cache']:
                 cacheLinks[urlLink] = returnCode
-            
+
         print '  [%s]' % returnCode
     else:
         if options['no_local']: return
 
         c = Client()
-        newUrl = os.path.normpath('/%s/_v/%s/%s/%s' % (chapter.version.book.url_title, chapter.version.getVersion(), chapter.url_title, urlLink))
+        newUrl = os.path.normpath('/%s/_v/%s/%s/%s' % (
+            chapter.version.book.url_title, chapter.version.getVersion(), chapter.url_title, urlLink))
 
         print '    >> ', newUrl,
         response = c.get(newUrl)
@@ -74,60 +73,61 @@ def checkLink(options, chapter, urlLink):
 
 
 class Command(BaseCommand):
-    args = '<book name> [, <book name>, ...]'
+    BOOK_NAMES = '<book name> [, <book name>, ...]'
     help = 'Check links in books.'
 
-    option_list = BaseCommand.option_list + (
-        make_option('--no-remote',
-                    action='store_true',
-                    dest='no_remote',
-                    default=False,
-                    help='Do we check for remote links?'),
-
-        make_option('--no-local',
-                    action='store_true',
-                    dest='no_local',
-                    default=False,
-                    help='Do we check for local links?'),
-
-        make_option('--no-cache',
-                    action='store_true',
-                    dest='no_cache',
-                    default=False,
-                    help='Do not cache network links.'),
-
-        make_option('--ignore-url',
-                    action='append',
-                    dest='ignore_url',
-                    default=[],
-                    help='What hosts to ignore, e.g. http://www.wikipedia.org/'),
-
-        )
-    
+    def add_arguments(self, parser):
+        parser.add_argument(self.BOOK_NAMES, nargs='+', type=str)
+
+        parser.add_argument('--no-remote',
+                            action='store_true',
+                            dest='no_remote',
+                            default=False,
+                            help='Do we check for remote links?')
+
+        parser.add_argument('--no-local',
+                            action='store_true',
+                            dest='no_local',
+                            default=False,
+                            help='Do we check for local links?')
+
+        parser.add_argument('--no-cache',
+                            action='store_true',
+                            dest='no_cache',
+                            default=False,
+                            help='Do not cache network links.')
+
+        parser.add_argument('--ignore-url',
+                            action='append',
+                            dest='ignore_url',
+                            default=[],
+                            help='What hosts to ignore, e.g. http://www.wikipedia.org/')
+
     def handle(self, *args, **options):
         global cacheLinks
 
+        book_names = options.get(self.BOOK_NAMES, [])
+
         # filter only books we want
-        if len(args) > 0:
-            booksList = models.Book.objects.filter(url_title__in=args).order_by('url_title')
+        if book_names:
+            booksList = models.Book.objects.filter(url_title__in=book_names).order_by('url_title')
         else:
             booksList = models.Book.objects.all().order_by('url_title')
 
-            
         for book in booksList:
             print '[%s]' % book.url_title
 
             try:
                 for chapter in models.Chapter.objects.filter(version__book=book):
                     print '  [%s]' % chapter.url_title,
-                    
+
                     try:
                         tree = html.document_fromstring(chapter.content)
                         print ''
                     except:
                         print '   [ERROR PARSING HTML]'
                         continue
-                    
+
                     for elem in tree.iter():
                         src = elem.get('src')
                         if src:

lib/booki/editor/management/commands/bookrename.py

@@ -15,27 +15,28 @@
 # along with Booktype.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.core.management.base import BaseCommand, CommandError
-from optparse import make_option
 
 from django.conf import settings
 
 from booktype.utils import config
 
 class Command(BaseCommand):
-    args = "<key>"
     help = "Delete configuration variable."
     requires_model_validation = False
 
+    def add_arguments(self, parser):
+        parser.add_argument("<key>", nargs=1, type=str)
+
     def handle(self, *args, **options):
         if not hasattr(settings, 'BOOKTYPE_CONFIG'):
             raise CommandError('Does not have BOOKTYPE_CONFIG in settings.py file.')
 
-        if len(args) != 1:
+        if not options['<key>'][0]:
             raise CommandError("You must specify variable name")
 
-        if not settings.BOOKTYPE_CONFIG.has_key(args[0]):
+        if not settings.BOOKTYPE_CONFIG.has_key(options['<key>'][0]):
             raise CommandError("There is no such variable.")
 
-        del settings.BOOKTYPE_CONFIG[args[0]]
+        del settings.BOOKTYPE_CONFIG[options['<key>'][0]]
 
         config.save_configuration()

lib/booki/editor/management/commands/brokenlinks.py

@@ -14,41 +14,37 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Booktype.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.core.management.base import BaseCommand, CommandError
-from optparse import make_option
+import json
 
+from django.core.management.base import BaseCommand, CommandError
 from django.conf import settings
 
-from booktype.utils import config
-import json
 
 class Command(BaseCommand):
-    args = "<key>"
     help = "Get value for configuration variable."
-
-    option_list = BaseCommand.option_list + (
-        make_option('--as_json',
-                    action='store_true',
-                    dest='as_json',
-                    default=False,
-                    help='Value is defined as JSON encoded string.'),
-        )
-
     requires_model_validation = False
 
+    def add_arguments(self, parser):
+        parser.add_argument("<key>", nargs=1, type=str)
+        parser.add_argument('--as_json',
+                            action='store_true',
+                            dest='as_json',
+                            default=False,
+                            help='Value is defined as JSON encoded string.')
+
     def handle(self, *args, **options):
         if not hasattr(settings, 'BOOKTYPE_CONFIG'):
             raise CommandError('Does not have BOOKTYPE_CONFIG in settings.py file.')
 
-        if len(args) != 1:
+        if not options["<key>"][0]:
             raise CommandError("You must specify variable name")
 
-        if not settings.BOOKTYPE_CONFIG.has_key(args[0]):
+        if not settings.BOOKTYPE_CONFIG.has_key(options["<key>"][0]):
             raise CommandError("There is no such variable.")
 
-        value = settings.BOOKTYPE_CONFIG[args[0]]
+        value = settings.BOOKTYPE_CONFIG[options["<key>"][0]]
 
         if options['as_json']:
             value = json.dumps(value)
 
-        self.stdout.write(str(value)+"\n")
+        self.stdout.write(str(value) + "\n")