From c3c48e01eb0ef516eb73de8f8e428af8ba1cdc1c Mon Sep 17 00:00:00 2001
From: RogueM <chaosgen6@googlemail.com>
Date: Tue, 13 Sep 2016 18:27:55 +0100
Subject: [PATCH] PEP8 compliant import

---
 convert.py                |  5 +++--
 generate-html.py          | 40 ++++++++++++++++++++++-----------------
 generate-json.py          | 13 ++++++++++---
 markjaml.py               | 12 ++++++++++--
 pinout.py                 |  7 ++++++-
 serve.py                  |  9 ++++++++-
 tools/generate-defines.py | 14 ++++++++++----
 urlmapper.py              | 14 ++++++++------
 8 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/convert.py b/convert.py
index d40d30e..d3a5907 100644
--- a/convert.py
+++ b/convert.py
@@ -1,4 +1,6 @@
-import json, sys
+import json
+import sys
+
 
 db = json.load(open('pi-pinout.db'))
 
@@ -27,4 +29,3 @@ if len(sys.argv) > 2:
     mode = sys.argv[2]
 
 print("Pin {} is {}: {}".format(pin, mode.upper(), from_phys(pin, mode)))
-
diff --git a/generate-html.py b/generate-html.py
index cf31c1e..cef3d3b 100755
--- a/generate-html.py
+++ b/generate-html.py
@@ -1,13 +1,20 @@
 #!/usr/bin/env python
-import markdown
-import unicodedata
-import re
+
 import os
+import re
 import sys
-import pinout
+import unicodedata
+
+try:
+    import markdown
+except ImportError:
+    exit("This script requires the psutil module\nInstall with: sudo pip install Markdown")
+
 import markjaml
+import pinout
 import urlmapper
 
+
 reload(sys)
 sys.setdefaultencoding('utf8')
 
@@ -44,7 +51,6 @@ default_strings = {
 }
 
 
-
 def cssify(value):
     value = slugify(value);
     if value[0] == '3' or value[0] == '5':
@@ -246,17 +252,17 @@ def render_pin_page(pin_num):
             fn_functions.append(function)
 
         pin_functions = '''<table class="pin-functions">
-		<thead>
-			<tr>
-				<th>{headings}</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr>
-				<td>{functions}</td>
-			</tr>
-		</tbody>
-		</table>'''.format(headings='</th><th>'.join(fn_headings), functions='</td><td>'.join(fn_functions))
+        <thead>
+            <tr>
+                <th>{headings}</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>{functions}</td>
+            </tr>
+        </tbody>
+        </table>'''.format(headings='</th><th>'.join(fn_headings), functions='</td><td>'.join(fn_functions))
 
     pin_url = slugify('pin{}_{}'.format(pin_num, pin_url))
 
@@ -270,7 +276,7 @@ def render_pin_page(pin_num):
     # if pin_text != None:
     return pin_url, pin_text, pin_text_name  # pages[pin_url] = pin_text
 
-
+    
 def render_pin(pin_num, selected_url, overlay=None):
     pin = pinout.pins[str(pin_num)]
 
diff --git a/generate-json.py b/generate-json.py
index 7784baf..5402b46 100755
--- a/generate-json.py
+++ b/generate-json.py
@@ -1,11 +1,18 @@
 #!/usr/bin/env python
+
 import json
-import markdown
-import unicodedata
 import re
 import sys
-import pinout
+import unicodedata
+
+try:
+    import markdown
+except ImportError:
+    exit("This script requires the psutil module\nInstall with: sudo pip install Markdown")
+
 import markjaml
+import pinout
+
 
 reload(sys)
 sys.setdefaultencoding('utf8')
diff --git a/markjaml.py b/markjaml.py
index 05c6258..ac2104a 100644
--- a/markjaml.py
+++ b/markjaml.py
@@ -1,9 +1,17 @@
 import json
-import markdown
-import yaml
 import re
 import unicodedata
 
+try:
+    import markdown
+except ImportError:
+    exit("This script requires the psutil module\nInstall with: sudo pip install Markdown")
+
+try:
+    import yaml
+except ImportError:
+    exit("This script requires the psutil module\nInstall with: sudo pip install PyYAML")
+
 
 def slugify(value):
     """
diff --git a/pinout.py b/pinout.py
index 673e99d..58aaebd 100644
--- a/pinout.py
+++ b/pinout.py
@@ -1,7 +1,12 @@
 import json
-import yaml
 import time
 
+try:
+    import yaml
+except ImportError:
+    exit("This script requires the psutil module\nInstall with: sudo pip install PyYAML")
+
+
 DB_FILE = 'pi-pinout.yaml'
 SETTINGS_FILE = 'settings.yaml'
 
diff --git a/serve.py b/serve.py
index e878db6..d96b584 100755
--- a/serve.py
+++ b/serve.py
@@ -1,6 +1,13 @@
 #!/usr/bin/env python
-from flask import Flask, send_from_directory
+
 import sys
+
+try:
+    from flask import Flask, send_from_directory
+except ImportError:
+    exit("This script requires the psutil module\nInstall with: sudo pip install Flask")
+
+
 app = Flask(__name__)
 
 lang = 'en'
diff --git a/tools/generate-defines.py b/tools/generate-defines.py
index 76d38ba..50b4ef9 100755
--- a/tools/generate-defines.py
+++ b/tools/generate-defines.py
@@ -1,11 +1,17 @@
 #!/usr/bin/env python
+
 import json
-import markdown
-import unicodedata
-import re
 import os
-import time
+import re
 import sys
+import time
+import unicodedata
+
+try:
+    import markdown
+except ImportError:
+    exit("This script requires the psutil module\nInstall with: sudo pip install Markdown")
+
 
 lang = 'en'
 
diff --git a/urlmapper.py b/urlmapper.py
index b889c31..fd362d7 100755
--- a/urlmapper.py
+++ b/urlmapper.py
@@ -1,11 +1,14 @@
 #!/usr/bin/env python
-import unicodedata
-import re
-import sys
-import pinout
-import markjaml
+
 import glob
 import os
+import re
+import sys
+import unicodedata
+
+import markjaml
+import pinout
+
 
 reload(sys)
 sys.setdefaultencoding('utf8')
@@ -91,4 +94,3 @@ def generate_urls(lang="en"):
     for lang in languages:
         urls[lang] = generate_for_lang(lang)
     return urls
-