Merge branch 'gh-pages' of github.com:swcarpentry/styles into gh-pages

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."""

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

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.

bin/repo_check.py

@@ -4,14 +4,14 @@
 Check repository settings.
 """
 
+from __future__ import print_function
 import sys
 import os
 from subprocess import Popen, PIPE
 import re
 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:

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)

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:

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'[^@]+@[^@]+\.[^@]+'