Merge branch 'wl-locale-merge' into locale_new

[wolnelektury.git] / apps / compress / management / commands / synccompress.py

diff --git a/apps/compress/management/commands/synccompress.py b/apps/compress/management/commands/synccompress.py
index f5624f5..e2fc6aa 100644 (file)
--- a/apps/compress/management/commands/synccompress.py
+++ b/apps/compress/management/commands/synccompress.py
@@ -6,22 +6,21 @@ from django.conf import settings
 class Command(NoArgsCommand):
     option_list = NoArgsCommand.option_list + (
         make_option('--force', action='store_true', default=False, help='Force update of all files, even if the source files are older than the current compressed file.'),
 class Command(NoArgsCommand):
     option_list = NoArgsCommand.option_list + (
         make_option('--force', action='store_true', default=False, help='Force update of all files, even if the source files are older than the current compressed file.'),

-        make_option('--verbosity', action='store', dest='verbosity', default='1',
-            type='choice', choices=['0', '1', '2'],
-            help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),

     )
     help = 'Updates and compresses CSS and JavsScript on-demand, without restarting Django'
     args = ''
 
     def handle_noargs(self, **options):
     )
     help = 'Updates and compresses CSS and JavsScript on-demand, without restarting Django'
     args = ''
 
     def handle_noargs(self, **options):

-
+        

         force = options.get('force', False)
         verbosity = int(options.get('verbosity', 1))
 
         from compress.utils import needs_update, filter_css, filter_js
 
         for name, css in settings.COMPRESS_CSS.items():
         force = options.get('force', False)
         verbosity = int(options.get('verbosity', 1))
 
         from compress.utils import needs_update, filter_css, filter_js
 
         for name, css in settings.COMPRESS_CSS.items():

-            u, version = needs_update(css['output_filename'], css['source_filenames'])
+            print css['output_filename']
+            u, version = needs_update(css['output_filename'], 
+                css['source_filenames'])

 
             if (force or u) or verbosity >= 2:
                 msg = 'CSS Group \'%s\'' % name
 
             if (force or u) or verbosity >= 2:
                 msg = 'CSS Group \'%s\'' % name


@@ -36,7 +35,8 @@ class Command(NoArgsCommand):
                 print
 
         for name, js in settings.COMPRESS_JS.items():
                 print
 
         for name, js in settings.COMPRESS_JS.items():

-            u, version = needs_update(js['output_filename'], js['source_filenames'])
+            u, version = needs_update(js['output_filename'], 
+                js['source_filenames'])

 
             if (force or u) or verbosity >= 2:
                 msg = 'JavaScript Group \'%s\'' % name
 
             if (force or u) or verbosity >= 2:
                 msg = 'JavaScript Group \'%s\'' % name


@@ -48,4 +48,12 @@ class Command(NoArgsCommand):
                 filter_js(js, verbosity)
 
             if (force or u) or verbosity >= 2:
                 filter_js(js, verbosity)
 
             if (force or u) or verbosity >= 2:

-                print
\ No newline at end of file
+                print
+
+# Backwards compatibility for Django r9110
+if not [opt for opt in Command.option_list if opt.dest=='verbosity']:
+    Command.option_list += (
+    make_option('--verbosity', '-v', action="store", dest="verbosity",
+        default='1', type='choice', choices=['0', '1', '2'],
+        help="Verbosity level; 0=minimal output, 1=normal output, 2=all output"),
+    )