From 90ba15483bc0d34555b981423298d4b4053f3ca6 Mon Sep 17 00:00:00 2001
From: Lingchao Xin <lingchaox.xin@intel.com>
Date: Tue, 10 Dec 2013 15:08:10 +0800
Subject: [PATCH] Sort imports with isort

Change-Id: I380d46f5116ad63f8a3c6cd3304dbdc502030d14
---
 setup.py             |  1 -
 snapdiff/__init__.py |  6 +++---
 snapdiff/image.py    | 10 +++++-----
 snapdiff/render.py   |  4 ++--
 snapdiff/repo.py     | 10 ++++------
 snapdiff/utils.py    |  3 +--
 tests/test_render.py |  2 +-
 tests/test_utils.py  |  2 +-
 tools/snap-diff      |  6 +++---
 9 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/setup.py b/setup.py
index 294b0db..0001cba 100644
--- a/setup.py
+++ b/setup.py
@@ -20,4 +20,3 @@ setup(name=snapdiff.__title__,
           'beautifulsoup4>=4.3.2'],
       zip_safe=False,
 )
-
diff --git a/snapdiff/__init__.py b/snapdiff/__init__.py
index eeb9767..4f8d6b6 100644
--- a/snapdiff/__init__.py
+++ b/snapdiff/__init__.py
@@ -25,11 +25,12 @@ or use it directly:
 __title__ = 'python-snapdiff'
 __version__ = '0.1'
 
+import json
+
+from .image import ks_diff, packages
 from .render import output_html
 from .repo import Repo
-from .image import ks_diff, packages
 
-import json
 
 def diff_to_JSON(old_url, new_url, style='repo'):
     """Output diffs' json format"""
@@ -129,4 +130,3 @@ def diff_to_HTML(old_url, new_url, style='repo'):
             }
 
     return output_html('diff.html', **context)
-
diff --git a/snapdiff/image.py b/snapdiff/image.py
index 8b46cc4..ef6ec81 100644
--- a/snapdiff/image.py
+++ b/snapdiff/image.py
@@ -1,12 +1,13 @@
-from .utils import JsonDict
-
-from bs4 import BeautifulSoup
 import difflib
 import glob
 import os
-import requests
 from StringIO import StringIO
 
+import requests
+from bs4 import BeautifulSoup
+
+from .utils import JsonDict
+
 
 def _get_file(url, suffix='.ks'):
     if url.startswith('http') or url.startswith('https'):
@@ -62,4 +63,3 @@ def packages(url):
             packages_info[name].append(package_info)
 
     return packages_info
-
diff --git a/snapdiff/render.py b/snapdiff/render.py
index 707a806..f3283f4 100644
--- a/snapdiff/render.py
+++ b/snapdiff/render.py
@@ -1,6 +1,7 @@
-from jinja2 import Environment, FileSystemLoader
 import os
 
+from jinja2 import Environment, FileSystemLoader
+
 _SETTINGS = {
     'template_path': os.path.join(os.path.dirname(__file__), 'templates'),
     }
@@ -13,4 +14,3 @@ def output_html(template_name, **kwargs):
     )
     template = env.get_template(template_name)
     return template.render(kwargs)
-
diff --git a/snapdiff/repo.py b/snapdiff/repo.py
index 4734a3e..60429e5 100644
--- a/snapdiff/repo.py
+++ b/snapdiff/repo.py
@@ -1,11 +1,11 @@
-from .utils import xml2obj
-from .utils import JsonDict
-
 import gzip
 import mimetypes
-import requests
 from StringIO import StringIO
 
+import requests
+
+from .utils import JsonDict, xml2obj
+
 
 class RepoError(Exception):
     """Local custom Exception class, handle Repo Errors"""
@@ -70,5 +70,3 @@ class Repo(object):
                 packages_info[package.name].append(package)
 
         return packages_info
-
-
diff --git a/snapdiff/utils.py b/snapdiff/utils.py
index 1159b2d..67fd0f7 100644
--- a/snapdiff/utils.py
+++ b/snapdiff/utils.py
@@ -1,6 +1,7 @@
 import re
 import xml.sax.handler
 
+
 def xml2obj(src):
     """
     A simple function to converts XML data into native Python object,
@@ -100,5 +101,3 @@ class JsonDict(dict):
 
     def get(self, key, default=None):
         return self.__dict__.get(key, default)
-
-
diff --git a/tests/test_render.py b/tests/test_render.py
index 099f0ff..1c1f117 100644
--- a/tests/test_render.py
+++ b/tests/test_render.py
@@ -3,6 +3,7 @@
 """Tests for render module."""
 
 import unittest
+
 from snapdiff import render
 
 
@@ -13,4 +14,3 @@ class RenderTestCase(unittest.TestCase):
         users = [{'url': 'http://example.com', 'username': 'foo'}]
         output = render.output_html('sparrow.html', users=users)
         self.assertEqual(output, u'<ul>\n\n  <li><a href="http://example.com">foo</a></li>\n\n</ul>\n')
-
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 48e5982..0ea56f2 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,6 +1,7 @@
 """Tests for utils module."""
 
 import unittest
+
 from snapdiff import utils
 
 
@@ -35,4 +36,3 @@ class UtilsTestCase(unittest.TestCase):
         self.assertEqual(obj.revision, '1385428310')
         self.assertTrue(isinstance(obj['data'], list))
         self.assertEqual(obj['data'][0].size, '251882')
-
diff --git a/tools/snap-diff b/tools/snap-diff
index 1217d5b..cbd82ad 100755
--- a/tools/snap-diff
+++ b/tools/snap-diff
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
-import snapdiff
-
 import argparse
 import sys
 
+import snapdiff
+
+
 def main(argv):
     description = 'Diff two repos with different urls'
     parser = argparse.ArgumentParser(description=description)
@@ -21,4 +22,3 @@ def main(argv):
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv[1:]))
-
-- 
2.34.1