diff --git a/bin/extract_figures.py b/bin/extract_figures.py index 56ee812ed..63a7752ef 100755 --- a/bin/extract_figures.py +++ b/bin/extract_figures.py @@ -1,12 +1,12 @@ #!/usr/bin/env python +from __future__ import print_function import sys import os import glob from optparse import OptionParser from util import Reporter, read_markdown, IMAGE_FILE_SUFFIX -from __future__ import print_function def main(): """Main driver.""" diff --git a/bin/lesson_check.py b/bin/lesson_check.py index 95ceb5ee2..ace8de694 100755 --- a/bin/lesson_check.py +++ b/bin/lesson_check.py @@ -4,6 +4,7 @@ Check lesson files and their contents. """ +from __future__ import print_function import sys import os import glob diff --git a/bin/lesson_initialize.py b/bin/lesson_initialize.py index 9f3726321..ef275399a 100755 --- a/bin/lesson_initialize.py +++ b/bin/lesson_initialize.py @@ -3,9 +3,9 @@ """Initialize a newly-created repository.""" +from __future__ import print_function import sys import os -from __future__ import print_function ROOT_AUTHORS = '''\ FIXME: list authors' names and email addresses. diff --git a/bin/repo_check.py b/bin/repo_check.py index 2c84e54e8..fd04ce936 100755 --- a/bin/repo_check.py +++ b/bin/repo_check.py @@ -4,6 +4,7 @@ Check repository settings. """ +from __future__ import print_function import sys import os from subprocess import Popen, PIPE @@ -11,7 +12,6 @@ from optparse import OptionParser from util import Reporter, load_yaml, require -from __future__ import print_function # Import this way to produce a more useful error message. try: diff --git a/bin/test_lesson_check.py b/bin/test_lesson_check.py index fbd1b271a..743d0cf45 100755 --- a/bin/test_lesson_check.py +++ b/bin/test_lesson_check.py @@ -5,12 +5,12 @@ class TestFileList(unittest.TestCase): def setUp(self): - self.reporter = util.Reporter(None) ## TODO: refactor reporter class. + self.reporter = util.Reporter() ## TODO: refactor reporter class. def test_file_list_has_expected_entries(self): # For first pass, simply assume that all required files are present - all_filenames = [item[1].replace('%', '') - for item in lesson_check.REQUIRED_FILES] + all_filenames = [filename.replace('%', '') + for filename in lesson_check.REQUIRED_FILES] lesson_check.check_fileset('', self.reporter, all_filenames) self.assertEqual(len(self.reporter.messages), 0) diff --git a/bin/util.py b/bin/util.py index e59866f8c..0cc8de69d 100644 --- a/bin/util.py +++ b/bin/util.py @@ -1,8 +1,8 @@ +from __future__ import print_function import sys import os import json from subprocess import Popen, PIPE -from __future__ import print_function # Import this way to produce a more useful error message. try: diff --git a/bin/workshop_check.py b/bin/workshop_check.py index 3699c9938..d3051bf1a 100755 --- a/bin/workshop_check.py +++ b/bin/workshop_check.py @@ -4,12 +4,12 @@ docstrings on the checking functions for a summary of the checks. ''' +from __future__ import print_function import sys import os import re from datetime import date from util import Reporter, split_metadata, load_yaml, check_unwanted_files -from __future__ import print_function # Metadata field patterns. EMAIL_PATTERN = r'[^@]+@[^@]+\.[^@]+'