From 3c5c742a0b9e8d3537f1698f3b8dd314aa804305 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 15 Jan 2016 23:59:37 -0500 Subject: [PATCH 1/3] Use the latest flake8 --- docker/docker_requirements.txt | 2 +- requirements.txt | 2 +- server_requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/docker_requirements.txt b/docker/docker_requirements.txt index 197c7220cf5..071df763dbd 100755 --- a/docker/docker_requirements.txt +++ b/docker/docker_requirements.txt @@ -1,7 +1,7 @@ selenium==2.48.0 nose==1.3.7 pytest==2.8.5 -flake8==2.5.0 +flake8==2.5.1 requests==2.9.1 urllib3==1.14 BeautifulSoup==3.2.1 diff --git a/requirements.txt b/requirements.txt index 5e9a35881f9..5dcce8a493b 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ selenium==2.48.0 nose==1.3.7 pytest==2.8.5 -flake8==2.5.0 +flake8==2.5.1 requests==2.9.1 urllib3==1.14 BeautifulSoup==3.2.1 diff --git a/server_requirements.txt b/server_requirements.txt index 8b277f6c811..70bf04940e1 100755 --- a/server_requirements.txt +++ b/server_requirements.txt @@ -1,7 +1,7 @@ selenium==2.48.0 nose==1.3.7 pytest==2.8.5 -flake8==2.5.0 +flake8==2.5.1 requests==2.9.1 urllib3==1.14 BeautifulSoup==3.2.1 diff --git a/setup.py b/setup.py index cff8f7a3bc9..a67ae6b3a15 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ 'selenium==2.48.0', 'nose==1.3.7', 'pytest==2.8.5', - 'flake8==2.5.0', + 'flake8==2.5.1', 'requests==2.9.1', 'urllib3==1.14', 'BeautifulSoup==3.2.1', From 54f42a461585de79e0e01070e233ab539132becf Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 16 Jan 2016 00:00:04 -0500 Subject: [PATCH 2/3] deflake code based on new flake8 rules --- seleniumbase/fixtures/base_case.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py index 64daedb668b..84bac6e87bb 100755 --- a/seleniumbase/fixtures/base_case.py +++ b/seleniumbase/fixtures/base_case.py @@ -89,8 +89,8 @@ def update_text_value(self, selector, new_value, element = self.wait_for_element_visible(selector, timeout=timeout) element.clear() element.send_keys(new_value) - if (retry and element.get_attribute('value') != new_value - and not new_value.endswith('\n')): + if (retry and element.get_attribute('value') != new_value and ( + not new_value.endswith('\n'))): logging.debug('update_text_value is falling back to jQuery!') selector = self.jq_format(selector) self.set_value(selector, new_value) From 78426231055669ed3d31944ce55694422496f94c Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 16 Jan 2016 00:05:27 -0500 Subject: [PATCH 3/3] deflake with the new flake8 --- seleniumbase/plugins/hipchat_reporting_plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seleniumbase/plugins/hipchat_reporting_plugin.py b/seleniumbase/plugins/hipchat_reporting_plugin.py index 62d2fb1bbfa..675bda1827f 100755 --- a/seleniumbase/plugins/hipchat_reporting_plugin.py +++ b/seleniumbase/plugins/hipchat_reporting_plugin.py @@ -62,8 +62,8 @@ def configure(self, options, conf): when using the hipchat reporting plugin.''') else: self.hipchat_room_id = options.hipchat_room_id - self.hipchat_owner_to_mention = (options.hipchat_owner_to_mention - or None) + self.hipchat_owner_to_mention = ( + options.hipchat_owner_to_mention or None) self.hipchat_notify_on_success = options.hipchat_notify_on_success def addSuccess(self, test, capt):