Pylint

jupytext/cli.py

@@ -45,8 +45,8 @@ def convert_notebook_files(nb_files, fmt, input_format=None, output=None, pre_co
 
         for file in modified:
             dest_file = file[:-len(input_ext)] + ext
-            nb = readf(file)
-            writef(nb, dest_file, format_name=format_name)
+            notebook = readf(file)
+            writef(notebook, dest_file, format_name=format_name)
             system('git', 'add', dest_file)
 
         for file in deleted:

jupytext/contentsmanager.py

@@ -37,17 +37,18 @@ def kernelspec_from_language(language):
 
 
 def jupytext_formats_from_metadata(metadata, ext):
+    """Are the paired formats stored in the metadata in the text representation?"""
     if ext == '.ipynb':
         return True
-    else:
-        notebook_metadata_filter = metadata_filter_as_dict(
-            metadata.get('jupytext', {}).get('metadata_filter', {}).get('notebook', ''))
-        if 'jupytext' in notebook_metadata_filter.get('additional', []):
-            return True
-        excluded = notebook_metadata_filter.get('excluded', [])
-        if 'jupytext' in excluded or excluded == 'all':
-            return False
+
+    notebook_metadata_filter = metadata_filter_as_dict(
+        metadata.get('jupytext', {}).get('metadata_filter', {}).get('notebook', ''))
+    if 'jupytext' in notebook_metadata_filter.get('additional', []):
         return True
+    excluded = notebook_metadata_filter.get('excluded', [])
+    if 'jupytext' in excluded or excluded == 'all':
+        return False
+    return True
 
 
 def _jupytext_writes(ext, format_name):

jupytext/formats.py

@@ -218,8 +218,7 @@ def guess_format(text, ext):
         if double_percent_count >= 1:
             if magic_command_count:
                 return 'hydrogen'
-            else:
-                return 'percent'
+            return 'percent'
 
         if twenty_hash_count >= 2:
             return 'sphinx'

tests/test_cli.py

@@ -189,8 +189,7 @@ def test_combine_lower_version_raises(tmpdir):
     writef(nb, tmp_ipynb)
 
     with pytest.raises(SystemExit):
-        with mock.patch('jupytext.header.INSERT_AND_CHECK_VERSION_NUMBER',
-                        True):
+        with mock.patch('jupytext.header.INSERT_AND_CHECK_VERSION_NUMBER', True):
             jupytext(args=[tmp_nbpy, '--to', 'ipynb', '--update'])