From 4f364764aea624a3db9a6033b5dba8a70f93535d Mon Sep 17 00:00:00 2001
From: Jakob de Maeyer <jakobdm1@gmail.com>
Date: Tue, 10 Nov 2015 22:48:50 +0100
Subject: [PATCH] Simplify BaseSettings.__get__(), .getpriority()

---
 scrapy/settings/__init__.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/scrapy/settings/__init__.py b/scrapy/settings/__init__.py
index e62bdd08e..342d2585e 100644
--- a/scrapy/settings/__init__.py
+++ b/scrapy/settings/__init__.py
@@ -90,10 +90,9 @@ class BaseSettings(MutableMapping):
         self.update(values, priority)
 
     def __getitem__(self, opt_name):
-        value = None
-        if opt_name in self:
-            value = self.attributes[opt_name].value
-        return value
+        if opt_name not in self:
+            return None
+        return self.attributes[opt_name].value
 
     def __contains__(self, name):
         return name in self.attributes
@@ -212,10 +211,9 @@ class BaseSettings(MutableMapping):
         :param name: the setting name
         :type name: string
         """
-        prio = None
-        if name in self:
-            prio = self.attributes[name].priority
-        return prio
+        if name not in self:
+            return None
+        return self.attributes[name].priority
 
     def maxpriority(self):
         """