From patchwork Wed Feb 3 21:24:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 578384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D957B140778 for ; Thu, 4 Feb 2016 08:25:01 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id B76801A0279 for ; Thu, 4 Feb 2016 08:25:01 +1100 (AEDT) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lists.ozlabs.org (Postfix) with ESMTP id 205EA1A023C for ; Thu, 4 Feb 2016 08:24:58 +1100 (AEDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 03 Feb 2016 13:24:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,391,1449561600"; d="scan'208";a="740071048" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 03 Feb 2016 13:24:57 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u13LOulB027815; Wed, 3 Feb 2016 21:24:56 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id u13LOuqN017929; Wed, 3 Feb 2016 21:24:56 GMT Received: (from sfinucan@localhost) by sivswdev01.ir.intel.com with id u13LOuIR017925; Wed, 3 Feb 2016 21:24:56 GMT From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH] pep8: Resolve some issues with lambda functions Date: Wed, 3 Feb 2016 21:24:53 +0000 Message-Id: <1454534693-17888-1-git-send-email-stephen.finucane@intel.com> X-Mailer: git-send-email 2.0.0 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Signed-off-by: Stephen Finucane --- patchwork/tests/browser.py | 17 +++++++++-------- patchwork/views/user.py | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/patchwork/tests/browser.py b/patchwork/tests/browser.py index 4444f9d..848e9be 100644 --- a/patchwork/tests/browser.py +++ b/patchwork/tests/browser.py @@ -21,11 +21,10 @@ import errno import os import time -import django -if django.VERSION < (1, 7): - from django.test import LiveServerTestCase as StaticLiveServerTestCase -else: +try: from django.contrib.staticfiles.testing import StaticLiveServerTestCase +except: # Django < 1.7 + from django.test import LiveServerTestCase as StaticLiveServerTestCase from selenium.common.exceptions import ( NoSuchElementException, StaleElementReferenceException, TimeoutException) @@ -139,22 +138,24 @@ class SeleniumTestCase(StaticLiveServerTestCase): return self.selenium.switch_to.active_element def wait_until_present(self, name): - is_present = lambda driver: driver.find_element_by_name(name) + def is_present(driver): + return driver.find_element_by_name(name) msg = "An element named '%s' should be on the page" % name element = Wait(self.selenium).until(is_present, msg) self.screenshot() return element def wait_until_visible(self, selector): - is_visible = lambda driver: self.find(selector).is_displayed() + def is_visible(driver): + return self.find(selector).is_displayed() msg = "The element matching '%s' should be visible" % selector Wait(self.selenium).until(is_visible, msg) self.screenshot() return self.find(selector) def wait_until_focused(self, selector): - is_focused = lambda driver: ( - self.find(selector) == self.focused_element()) + def is_focused(driver): + return self.find(selector) == self.focused_element() msg = "The element matching '%s' should be focused" % selector Wait(self.selenium).until(is_focused, msg) self.screenshot() diff --git a/patchwork/views/user.py b/patchwork/views/user.py index d6e5797..dd5eada 100644 --- a/patchwork/views/user.py +++ b/patchwork/views/user.py @@ -148,8 +148,8 @@ def link(request): [form.cleaned_data['email']]) except Exception: context['confirmation'] = None - context['error'] = 'An error occurred during confirmation. ' + \ - 'Please try again later' + context['error'] = ('An error occurred during confirmation. ' + 'Please try again later') else: form = UserPersonLinkForm() context['linkform'] = form