From 47f4ccef4ba345bda235799b7c1dea61e9188043 Mon Sep 17 00:00:00 2001
From: changzhi1990 <changzhi@unitedstack.com>
Date: Mon, 18 Jan 2016 14:19:56 +0800
Subject: [PATCH] Fix pep8

Change-Id: I630c43b1b73025f9d22e82456e15fe15f70a4c78
---
 .gitignore                                    | 54 +++++++++++++++++--
 stetho/stethoclient/agent_api.py              |  2 +-
 .../unit/stethoclient/test_stethoclient.py    | 10 ++--
 test-requirements.txt                         |  2 +-
 4 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5b5e3a..4def7e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,50 @@
-*.pyc
-stetho.egg-info/
-build/
-dist/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+!devstack/lib
+lib64
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+cover
+.testrepository
+*.sqlite
+.venv
+
+# Docs
+doc/source/_build/
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.idea
+.pydevproject
+*.swp
+
+# git
+AUTHORS
+ChangeLog
diff --git a/stetho/stethoclient/agent_api.py b/stetho/stethoclient/agent_api.py
index e728baa..38ac692 100644
--- a/stetho/stethoclient/agent_api.py
+++ b/stetho/stethoclient/agent_api.py
@@ -90,7 +90,7 @@ class TearDownLink(Command):
         try:
             res = server.teardown_link(parsed_args.interface)
         except Exception as e:
-            self.log.error('Error %s has occured because: ' % (res, e))
+            self.log.error('Error %s has occured because: %s' % (res, e))
 
 
 class SetUpLink(Lister):
diff --git a/stetho/tests/unit/stethoclient/test_stethoclient.py b/stetho/tests/unit/stethoclient/test_stethoclient.py
index aee4ea0..fc08b7d 100644
--- a/stetho/tests/unit/stethoclient/test_stethoclient.py
+++ b/stetho/tests/unit/stethoclient/test_stethoclient.py
@@ -46,7 +46,7 @@ class TestStethoClientMethods(unittest.TestCase):
         self.assertEqual(self.server.get_interface.called, True)
 
     def test_stethoclient_add_vlan_to_interface(self):
-        r = {u'message': '', 'code': 0, 'data': {}}
+        r = {'message': '', 'code': 0, 'data': {}}
         rr = {'message': '', 'code': 0, 'data': {'name': 'eth0'}}
         self.server.add_vlan_to_interface = mock.Mock(return_value=r)
         self.server.get_interface = mock.Mock(return_value=rr)
@@ -54,13 +54,13 @@ class TestStethoClientMethods(unittest.TestCase):
         self.assertEqual(self.server.add_vlan_to_interface.called, True)
 
     def test_stethoclient_ping(self):
-        r = {u'message': '', 'code': 0, 'data': {'1.2.4.8': 100}}
+        r = {'message': '', 'code': 0, 'data': {'1.2.4.8': 100}}
         self.server.ping = mock.Mock(return_value=r)
         shell.main(['ping', 'agent-64', '1.2.4.8'])
         self.assertEqual(self.server.ping.called, True)
 
     def test_stethoclient_setup_link(self):
-        r = {u'message': '', 'code': 0, 'data': {}}
+        r = {'message': '', 'code': 0, 'data': {}}
         rr = {'message': '', 'code': 0, 'data': {'name': 'eth0'}}
         self.server.get_interface = mock.Mock(return_value=rr)
         self.server.setup_link = mock.Mock(return_value=r)
@@ -68,13 +68,13 @@ class TestStethoClientMethods(unittest.TestCase):
         self.assertEqual(self.server.setup_link.called, True)
 
     def test_stethoclint_check_ports_on_br(self):
-        r = {u'message': '', 'code': 0, 'data': {'ovs_port': True}}
+        r = {'message': '', 'code': 0, 'data': {'ovs_port': True}}
         self.server.check_ports_on_br = mock.Mock(return_value=r)
         shell.main(['check-ports-on-br', 'agent-64', 'br0', 'ovs_port'])
         self.assertEqual(self.server.check_ports_on_br.called, True)
 
     def test_check_iperf(self):
-        iperf_server_r = {'message': '', u'code': 0, 'data': {'pid': 1234}}
+        iperf_server_r = {'message': '', 'code': 0, 'data': {'pid': 1234}}
         iperf_client_r = {
             'message': '',
             'code': 0,
diff --git a/test-requirements.txt b/test-requirements.txt
index cac7939..dc737c3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,3 @@
 mock
 flake8
-unittest
+unittest2