Skip to content

Commit ffdaa18

Browse files
committed
Unbreak --recursive
1 parent 93cffff commit ffdaa18

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

ChangeLog

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
1.6.1
2+
Unbreak --recursive
3+
14
1.6.0
25
Add support for setting the encoding, and handle fullwidth chars
36
in python2

icdiff

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import filecmp
1919
import unicodedata
2020
import codecs
2121

22-
__version__ = "1.6.0"
22+
__version__ = "1.6.1"
2323

2424
color_codes = {
2525
"red": '\033[0;31m',
@@ -469,11 +469,11 @@ def start():
469469
options.cols = 80
470470

471471
if options.recursive:
472-
diff_recursively(options, a, b, options.encoding)
472+
diff_recursively(options, a, b)
473473
else:
474474
diff_files(options, a, b, options.encoding)
475475

476-
def diff_recursively(options, a, b, encoding):
476+
def diff_recursively(options, a, b):
477477
def print_meta(s):
478478
print(simple_colorize(s, "magenta"))
479479

@@ -494,7 +494,6 @@ def diff_recursively(options, a, b, encoding):
494494
diff_recursively(options,
495495
os.path.join(a, child),
496496
os.path.join(b, child))
497-
498497
elif os.path.isdir(a) and os.path.isfile(b):
499498
print_meta("File %s is a directory while %s is a file" % (a, b))
500499

0 commit comments

Comments
 (0)