Merge branch 'master' into python-2.4

uncompyle6/main.py

@@ -1,3 +1,19 @@
+# Copyright (C) 2018 Rocky Bernstein <rocky@gnu.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import print_function
+>>>>>>> master
 import datetime, os, subprocess, sys, tempfile
 
 from uncompyle6 import verify, IS_PYPY, PYTHON_VERSION
@@ -224,6 +240,7 @@ def main(in_base, out_base, files, codes, outfile=None,
             sys.stdout.write("\n")
             sys.stderr.write("# file %s\n" % (infile))
             failed_files += 1
+            tot_files += 1
         except KeyboardInterrupt:
             if outfile:
                 outstream.close()