rattail-project/rattail Changeset

Changeset - 9694902d4cdd

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Lance Edgar - 9 years ago 2015-08-16 19:36:40
ledgar@sacfoodcoop.com

Remove some unused/unwanted command line arguments.

These weren't bad ideas, but hadn't really been implemented. Easier just
to get rid of them for now.

2 files changed with 1 insertions and 32 deletions:

rattail/commands.py

tests/test_commands.py

0 comments (0 inline, 0 general)

rattail/commands.py

➞

Show inline comments

@@ @@ -93,13 +93,13 @@ class Command(object): @@
     name = 'rattail'
     version = __version__
     description = "Retail Software Framework"
     long_description = """
 Rattail is a retail software framework.
-Copyright (c) 2010-2012 Lance Edgar <lance@edbob.org>
+Copyright (c) 2010-2015 Lance Edgar <lance@edbob.org>
 This program comes with ABSOLUTELY NO WARRANTY.  This is free software,
 and you are welcome to redistribute it under certain conditions.
 See the file COPYING.txt for more information.
 """
@@ @@ -178,20 +178,18 @@ Commands:\n""".format(self.description, self.name)) @@
             description=self.description,
             add_help=False,
+            )
         parser.add_argument('-c', '--config', action='append', dest='config_paths',
                             metavar='PATH')
         parser.add_argument('-d', '--debug', action='store_true', dest='debug')
         parser.add_argument('-n', '--no-init', action='store_true', default=False)
         parser.add_argument('-P', '--progress', action='store_true', default=False)
         parser.add_argument('--stdout', metavar='PATH', type=argparse.FileType('w'),
                             help="Optional path to which STDOUT should be effectively redirected.")
         parser.add_argument('--stderr', metavar='PATH', type=argparse.FileType('w'),
                             help="Optional path to which STDERR should be effectively redirected.")
         parser.add_argument('-v', '--verbose', action='store_true', dest='verbose')
         parser.add_argument('-V', '--version', action='version',
                             version="%(prog)s {0}".format(self.version))
         parser.add_argument('command', nargs='*')
         # Parse args and determine subcommand.
         args = parser.parse_args(list(args))
@@ @@ -229,29 +227,18 @@ Commands:\n""".format(self.description, self.name)) @@
         log = logging.getLogger()
         # TODO: Figure out the basic logging pattern we're after here.
         # edbob.basic_logging()
         logging.basicConfig()
         if args.verbose:
             log.setLevel(logging.INFO)
         if args.debug:
             log.setLevel(logging.DEBUG)
         # Initialize everything...
         config = None
         if not args.no_init:
             edbob.init(self.name, *(args.config_paths or []))
             config = RattailConfig(edbob.config)
             # Command line logging flags should override config.
             if args.verbose:
                 log.setLevel(logging.INFO)
             if args.debug:
                 log.setLevel(logging.DEBUG)
             # Configure the default database engine.
             try:
                 from rattail.db.util import configure_session_factory
             except ImportError:
                 pass            # assume no sqlalchemy
             else:

tests/test_commands.py

➞

Show inline comments

@@ @@ -131,30 +131,12 @@ class TestCommand(TestCase): @@
         config_path = tmp.putfile('test.ini', '')
         err_path = tmp.putfile('err.txt', '')
         command.run('fake', '--config', config_path, '--stderr', err_path)
         with open(err_path) as f:
             self.assertEqual(f.read(), "standard error stuff")
     def test_verbose_flag_sets_root_logging_level_to_info(self):
         self.assertEqual(logging.getLogger().getEffectiveLevel(), logging.NOTSET)
         tmp = TempIO()
         config_path = tmp.putfile('test.ini', '')
         command = commands.Command()
         fake = command.subcommands['fake'] = Mock()
         command.run('fake', '--config', config_path, '--verbose')
         self.assertEqual(logging.getLogger().getEffectiveLevel(), logging.INFO)
     def test_debug_flag_sets_root_logging_level_to_debug(self):
         self.assertEqual(logging.getLogger().getEffectiveLevel(), logging.NOTSET)
         tmp = TempIO()
         config_path = tmp.putfile('test.ini', '')
         command = commands.Command()
         fake = command.subcommands['fake'] = Mock()
         command.run('fake', '--config', config_path, '--debug')
         self.assertEqual(logging.getLogger().getEffectiveLevel(), logging.DEBUG)
     def test_noinit_flag_means_no_config(self):
         command = commands.Command()
         fake = command.subcommands['fake'] = Mock()
         command.run('fake', '--no-init')
         self.assertTrue(fake.return_value.config is None)

0 comments (0 inline, 0 general)