diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-10-18 09:34:47 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-10-18 09:34:47 -0300 |
| commit | a06b5719f028e619a4b3800fb346ed3c984e4d25 (patch) | |
| tree | b177a28201d647731797efb25c19fd9b3a311c9a /src/leap/bitmask/util | |
| parent | 932dcf596177b93c0b0f9e876be74be314fb6037 (diff) | |
| parent | f673b84a9a9b0fea3f6bbfefbb38cbd3d311cf3c (diff) | |
Merge branch 'release-0.3.5'0.3.5
Diffstat (limited to 'src/leap/bitmask/util')
| -rw-r--r-- | src/leap/bitmask/util/leap_argparse.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/util/leap_log_handler.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/util/leap_argparse.py b/src/leap/bitmask/util/leap_argparse.py index afe5be48..e8a9fda9 100644 --- a/src/leap/bitmask/util/leap_argparse.py +++ b/src/leap/bitmask/util/leap_argparse.py @@ -33,8 +33,7 @@ Launches Bitmask""", epilog=epilog) parser.add_argument('-d', '--debug', action="store_true", help=("Launches Bitmask in debug mode, writing debug" "info to stdout")) - # TODO: when we are ready to disable the --danger flag remove 'True or ' - if True or not IS_RELEASE_VERSION: + if not IS_RELEASE_VERSION: help_text = "Bypasses the certificate check for bootstrap" parser.add_argument('--danger', action="store_true", help=help_text) diff --git a/src/leap/bitmask/util/leap_log_handler.py b/src/leap/bitmask/util/leap_log_handler.py index 98924c12..1ab62331 100644 --- a/src/leap/bitmask/util/leap_log_handler.py +++ b/src/leap/bitmask/util/leap_log_handler.py @@ -52,7 +52,8 @@ class LogHandler(logging.Handler): :param logging_level: the debug level to define the color. :type logging_level: str. """ - log_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s' + log_format = ('%(asctime)s - %(name)s:%(funcName)s:L#%(lineno)s ' + '- %(levelname)s - %(message)s') formatter = logging.Formatter(log_format) return formatter |