Changeset 12812 for trunk

Timestamp:

04/07/11 15:09:37 (13 years ago)

Author:

sil

Message:

• Improved init of parser, logger, and (default) settings
• Removed some commented code
• Refactoring
• ...

Location:

trunk/sara_cmt

Files:

• cmt.py (modified) (4 diffs)
• sara_cmt/django_cli.py (modified) (3 diffs)
• sara_cmt/settings.py (modified) (4 diffs)

trunk/sara_cmt/cmt.py

@@ -36 +36 @@
 from sara_cmt.django_cli import ModelExtension, ObjectManager, QueryManager, \
     logger, parser
-from sara_cmt.parser import Parser
 
 import sara_cmt.cluster.models
@@ -80 +79 @@
 
 # Instantiate ConfigParser
-#configfile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config/cmt.cfg')
 configfile = os.path.join(settings.PROJECT_BASE, 'config/cmt.cfg')
 config_parser = ConfigParser.ConfigParser()
@@ -100 +98 @@
 CMTSARA_DESCRIPTION = config_parser.get('info', 'description').strip("'")
 
-parse_object = Parser()
-parser = parse_object.getParser()
-
-# Get and set the defaults
-DRYRUN = config_parser.getboolean('defaults', 'DRYRUN')
-INTERACTIVE = config_parser.getboolean('defaults', 'INTERACTIVE')
 #
 # </CMT-specific settings from file>
@@ -392 +384 @@
 
     parser.add_option('-n', '--dry-run',
-                    action='store_true',
-                    dest='DRYRUN',
-                    default=config_parser.getboolean('defaults', 'DRYRUN'),
-                    help="""This flag has to be given before -[aclmr]""")
+        action='store_true',
+        dest='DRYRUN',
+        default=config_parser.getboolean('defaults', 'DRYRUN'),
+        help="""This flag has to be given before -[aclmr]""")
     parser.add_option('--script',
-                    action='store_false',
-                    dest='INTERACTIVE',
-                    default=config_parser.getboolean('defaults',
-                                                     'INTERACTIVE'))
+        action='store_false',
+        dest='INTERACTIVE',
+        default=config_parser.getboolean('defaults', 'INTERACTIVE'))
     parser.add_option('-a', '--add',
-                    action='callback',
-                    callback=add,
-                    type='string',
-                    metavar='ENTITY',
-                    nargs=1,
-                    help="""Add an object of given ENTITY.
-
-                        arguments:   set <ASSIGNMENTS>
-
-                        The object will get values according to the given
-                        assignments. Assignments could be formed like
-                        [<FK>__]<attr>=<value>""")
+        action='callback',
+        callback=add,
+        type='string',
+        metavar='ENTITY',
+        nargs=1,
+        help="""Add an object of given ENTITY.
+
+            arguments:   set <ASSIGNMENTS>
+
+            The object will get values according to the given assignments. 
+            Assignments could be formed like [<FK>__]<attr>=<value>""")
     parser.add_option('-c', '--change',
-                    action='callback',
-                    callback=change,
-                    type='string',
-                    metavar='ENTITY',
-                    nargs=1,
-                    help="""Change value(s) of object(s) of given ENTITY.
-
-                        arguments:   get <QUERY> set <ASSIGNMENTS>
-
-                        The query, which consists out of one or more terms, is
-                        used to make a selection of objects to change. These
-                        objects will be changed according to the given
-                        assignments.""")
+        action='callback',
+        callback=change,
+        type='string',
+        metavar='ENTITY',
+        nargs=1,
+        help="""Change value(s) of object(s) of given ENTITY.
+
+            arguments:   get <QUERY> set <ASSIGNMENTS>
+
+            The query, which consists out of one or more terms, is used to make
+            a selection of objects to change. These objects will be changed
+            according to the given assignments.""")
     parser.add_option('-g', '--generate',
-                    action='callback',
-                    callback=generate,
-                    type='string',
-                    metavar='TEMPLATE',
-                    nargs=1,
-                    help='Render the given template')
+        action='callback',
+        callback=generate,
+        type='string',
+        metavar='TEMPLATE',
+        nargs=1,
+        help='Render the given template')
     parser.add_option('-l', '--list',
-                    action='callback',
-                    callback=show,
-                    type='string',
-                    metavar='ENTITY [ATTRIBUTE=VALUE]',
-                    nargs=1,
-                    help="""List object(s) of the given ENTITY.
-
-                        arguments:   get <QUERY>
-
-                        The query, which consists out of one or more terms, is
-                        used to make a selection of objects to list.""")
+        action='callback',
+        callback=show,
+        type='string',
+        metavar='ENTITY [ATTRIBUTE=VALUE]',
+        nargs=1,
+        help="""List object(s) of the given ENTITY.
+
+            arguments:   get <QUERY>
+
+            The query, which consists out of one or more terms, is used to make
+            a selection of objects to list.""")
     parser.add_option('-r', '--remove',
-                    action='callback',
-                    callback=remove,
-                    type='string',
-                    metavar='ENTITY [ATTRIBUTE=VALUE]',
-                    nargs=1,
-                    help='Remove objects which reflect the given query')
+        action='callback',
+        callback=remove,
+        type='string',
+        metavar='ENTITY [ATTRIBUTE=VALUE]',
+        nargs=1,
+        help='Remove objects which reflect the given query')
 
     # TODO: implement the following option(s)
     parser.add_option('-v', '--verbose',
-                    action='store_true',
-                    dest='VERBOSE',
-                    default=config_parser.getboolean('defaults',
-                                                     'VERBOSE'))
+        action='store_true',
+        dest='VERBOSE',
+        default=config_parser.getboolean('defaults', 'VERBOSE'))
 
     (options, args) = parser.parse_args()

trunk/sara_cmt/sara_cmt/django_cli.py

@@ -140 +140 @@
         """
         m2ms = [] # to collect M2Ms (which should be done at last)
+
         for arg in arg_dict:
             field = self._meta.get_field(arg)
@@ -151 +152 @@
                 continue
 
-            #if type(field) == ForeignKey:
-            #    self._setfk(field, arg_dict[arg])
-
-            #elif type(field) == ManyToManyField:
-            #    # Leave M2Ms for later, because they need an object's id
-            #    m2ms.append([field, arg_dict[arg]])
+            # Leave M2Ms for later, because they need an object's id
             elif type(field) == ManyToManyField:
                 m2ms.append([field,arg_dict[arg]])
 
-            #else:
-            #    logger.debug("Assuming '%s' is a regular field" % arg)
-            #    self._setattr(field=arg, value=arg_dict[arg])
             self._setattr(field=arg, value=arg_dict[arg])
 
@@ -236 +229 @@
             except AssertionError, err:
                 logger.error(err)
-            except sqlite3.IntegrityError, err:
+            except sqlite3.IntegrityError, err: # ??? what if using non-sqlite db? ???
                 logger.error('IntegrityError:', err)
 

trunk/sara_cmt/sara_cmt/settings.py

@@ -10 +10 @@
 PROJECT_BASE = os.path.normpath(os.path.join(SARACMT_BASE, os.path.pardir))
 
-#DEBUG = False
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
@@ -25 +23 @@
 # excluded from the SVN repository. An example of the needed info for database
 # configuration is commented out.
+# DATABASE_ENGINE    = 'postgresql_psycopg2'
+# DATABASE_NAME      = 'my_database'
+# DATABASE_USER      = 'db_user'
+# DATABASE_PASSWORD  = 'secret'
+# DATABASE_HOST      = 'database.example.com'
 from settings_db import *
-#TEST_DATABASE_NAME = ''
 
 
@@ -140 +142 @@
 ROOT_URLCONF = 'sara_cmt.urls'
 
+# Templates for the CMT command line interface.
+# (thus, the templates for our configfiles, etc)
+CMT_TEMPLATES_DIR = '/etc/sara_cmt/templates'
+
 # Templates for the CMT web-frontend.
 TEMPLATE_DIRS = (
@@ -147 +153 @@
     # Don't forget to use absolute paths, not relative paths.
     os.path.normpath(os.path.join(os.path.dirname(__file__), 'cluster/templates')),
+    CMT_TEMPLATES_DIR,
 )
-
-# Templates for the CMT command line interface.
-# (thus, the templates for our configfiles, etc)
-CMT_TEMPLATES_DIR = '/etc/sara_cmt/templates'
 
 FIXTURE_DIRS = (