Merge pull request #1376 from artificialsoph/patch-1

Configure `code_prettify` extension to load custom yapf styles by default.

Author: juhasch

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/README.md

@@ -239,6 +239,20 @@ to use [autopep8] instead of [yapf] to reformat the python code.
 But, if you want two alternative prettifiers available for the same kernel
 language, we need to define separate plugins.
 
+Custom Yapf Styles
+------------------
+
+Using the default `yapf` engine, one may define a custom formatting style according to the [package documentation](https://github.com/google/yapf#formatting-style).
+
+The `code_prettify` extension is configured to follow the default `yapf` ordering (minus the command line option) and will search for the formatting style in the following manner:
+
+> 1. In the [style] section of a .style.yapf file in either the current directory or one of its parent directories.
+> 2. In the [yapf] section of a setup.cfg file in either the current directory or one of its parent directories.
+> 3. In the ~/.config/yapf/style file in your home directory.
+>
+> If none of those files are found, the default style is used (PEP8).
+
+This means that one can set up a globa custom yapf style using `~/.config/yapf/style` or a project-specific one using the project directory.
 
 History
 -------
@@ -267,6 +281,9 @@ History
 - [@jfbercher], january 2017
   - updated documentation
   - added autopep8 nbextension as a plugin using the shared library
+- [@artificialsoph], Jan 2018
+  - updated documentation
+  - changed default behavior to load custom yapf styles
 
 
 [2to3]: README_2to3.md

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js

@@ -26,9 +26,12 @@ define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) {
             "library": ["import json",
             "def yapf_reformat(cell_text):", 
             "    import yapf.yapflib.yapf_api",
+            "    from yapf import file_resources",
+            "    import os",
             "    import re",
+            "    style_config = file_resources.GetDefaultStyleForDir(os.getcwd())",
             "    cell_text = re.sub('^%', '#%#', cell_text, flags=re.M)",
-            "    reformated_text = yapf.yapflib.yapf_api.FormatCode(cell_text)[0]",
+            "    reformated_text = yapf.yapflib.yapf_api.FormatCode(cell_text, style_config=style_config)[0]",
             "    return re.sub('^#%#', '%', reformated_text, flags=re.M)"].join("\n"),
             "prefix": "print(json.dumps(yapf_reformat(u",
             "postfix": ")))"