[Reproducible-commits] [diffoscope] 05/06: Accept None or 0 in Config setters
Jérémy Bobbio
lunar at moszumanska.debian.org
Wed Sep 2 12:47:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch master
in repository diffoscope.
commit d8d18709a8c72f9ff00f8d1a7b489bb35a74c166
Author: Jérémy Bobbio <lunar at debian.org>
Date: Wed Sep 2 12:43:48 2015 +0000
Accept None or 0 in Config setters
We instead set a default in the argument parser using the default in Config.
---
diffoscope/__main__.py | 9 ++++++---
diffoscope/config.py | 9 +++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/diffoscope/__main__.py b/diffoscope/__main__.py
index 3840a4f..8426dd8 100644
--- a/diffoscope/__main__.py
+++ b/diffoscope/__main__.py
@@ -53,13 +53,16 @@ def create_parser():
parser.add_argument('--max-report-size', metavar='BYTES',
dest='max_report_size', type=int,
help='maximum bytes written in report (default: %d)' %
- Config.general.max_report_size)
+ Config.general.max_report_size,
+ default=Config.general.max_report_size)
parser.add_argument('--max-diff-block-lines', dest='max_diff_block_lines', type=int,
help='maximum number of lines per diff block (default: %d)' %
- Config.general.max_diff_block_lines)
+ Config.general.max_diff_block_lines,
+ default=Config.general.max_diff_input_lines)
parser.add_argument('--max-diff-input-lines', dest='max_diff_input_lines', type=int,
help='maximum number of lines fed to diff (default: %d)' %
- Config.general.max_diff_input_lines)
+ Config.general.max_diff_input_lines,
+ default=Config.general.max_diff_input_lines)
parser.add_argument('--css', metavar='url', dest='css_url',
help='link to an extra CSS for the HTML report')
parser.add_argument('file1', help='first file to compare')
diff --git a/diffoscope/config.py b/diffoscope/config.py
index 493148f..cf927ca 100644
--- a/diffoscope/config.py
+++ b/diffoscope/config.py
@@ -43,8 +43,7 @@ class Config(object):
@max_diff_block_lines.setter
def max_diff_block_lines(self, value):
- if value:
- self._max_diff_block_lines = value
+ self._max_diff_block_lines = value
@property
def max_diff_input_lines(self):
@@ -52,8 +51,7 @@ class Config(object):
@max_diff_input_lines.setter
def max_diff_input_lines(self, value):
- if value:
- self._max_diff_input_lines = value
+ self._max_diff_input_lines = value
@property
def max_report_size(self):
@@ -61,6 +59,5 @@ class Config(object):
@max_report_size.setter
def max_report_size(self, value):
- if value:
- self._max_report_size = value
+ self._max_report_size = value
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the Reproducible-commits
mailing list