bug: type-confusing single-arg %-formatting

gunicorn/config.py

@@ -63,7 +63,7 @@ def __str__(self):
 
     def __getattr__(self, name):
         if name not in self.settings:
-            raise AttributeError("No configuration setting for: %s" % name)
+            raise AttributeError("No configuration setting for: %s" % (name, ))
         return self.settings[name].get()
 
     def __setattr__(self, name, value):
@@ -73,7 +73,7 @@ def __setattr__(self, name, value):
 
     def set(self, name, value):
         if name not in self.settings:
-            raise AttributeError("No configuration setting for: %s" % name)
+            raise AttributeError("No configuration setting for: %s" % (name, ))
         self.settings[name].set(value)
 
     def get_cmd_args_from_env(self):
@@ -191,7 +191,7 @@ def env(self):
             try:
                 k, v = s.split('=', 1)
             except ValueError:
-                raise RuntimeError("environment setting %r invalid" % s)
+                raise RuntimeError("environment setting %r invalid" % (s, ))
 
             env[k] = v
 
@@ -224,7 +224,7 @@ def paste_global_conf(self):
             try:
                 k, v = re.split(r'(?<!\\)=', s, 1)
             except ValueError:
-                raise RuntimeError("environment setting %r invalid" % s)
+                raise RuntimeError("environment setting %r invalid" % (s, ))
             k = k.replace('\\=', '=')
             v = v.replace('\\=', '=')
             global_conf[k] = v
@@ -310,7 +310,7 @@ def get(self):
 
     def set(self, val):
         if not callable(self.validator):
-            raise TypeError('Invalid validator: %s' % self.name)
+            raise TypeError('Invalid validator: %s' % (self.name, ))
         self.value = self.validator(val)
 
     def __lt__(self, other):
@@ -348,7 +348,7 @@ def validate_bool(val):
 
 def validate_dict(val):
     if not isinstance(val, dict):
-        raise TypeError("Value is not a dictionary: %s " % val)
+        raise TypeError("Value is not a dictionary: %s " % (val, ))
     return val
 
 
@@ -359,7 +359,7 @@ def validate_pos_int(val):
         # Booleans are ints!
         val = int(val)
     if val < 0:
-        raise ValueError("Value must be positive: %s" % val)
+        raise ValueError("Value must be positive: %s" % (val, ))
     return val
 
 
@@ -373,15 +373,15 @@ def validate_string(val):
     if val is None:
         return None
     if not isinstance(val, str):
-        raise TypeError("Not a string: %s" % val)
+        raise TypeError("Not a string: %s" % (val, ))
     return val.strip()
 
 
 def validate_file_exists(val):
     if val is None:
         return None
     if not os.path.exists(val):
-        raise ValueError("File %s does not exists." % val)
+        raise ValueError("File %s does not exists." % (val, ))
     return val
 
 
@@ -424,7 +424,7 @@ def _validate_callable(val):
                 mod_name, obj_name = val.rsplit(".", 1)
             except ValueError:
                 raise TypeError("Value '%s' is not import string. "
-                                "Format: module[.submodules...].object" % val)
+                                "Format: module[.submodules...].object" % (val, ))
             try:
                 mod = __import__(mod_name, fromlist=[obj_name])
                 val = getattr(mod, obj_name)
@@ -434,9 +434,9 @@ def _validate_callable(val):
                 raise TypeError("Can not load '%s' from '%s'"
                                 "" % (obj_name, mod_name))
         if not callable(val):
-            raise TypeError("Value is not callable: %s" % val)
+            raise TypeError("Value is not callable: %s" % (val, ))
         if arity != -1 and arity != util.get_arity(val):
-            raise TypeError("Value must have an arity of: %s" % arity)
+            raise TypeError("Value must have an arity of: %s" % (arity, ))
         return val
     return _validate_callable
 
@@ -452,7 +452,7 @@ def validate_user(val):
         try:
             return pwd.getpwnam(val).pw_uid
         except KeyError:
-            raise ConfigError("No such user: '%s'" % val)
+            raise ConfigError("No such user: '%s'" % (val, ))
 
 
 def validate_group(val):
@@ -467,7 +467,7 @@ def validate_group(val):
         try:
             return grp.getgrnam(val).gr_gid
         except KeyError:
-            raise ConfigError("No such group: '%s'" % val)
+            raise ConfigError("No such group: '%s'" % (val, ))
 
 
 def validate_post_request(val):
@@ -493,7 +493,7 @@ def validate_chdir(val):
 
     # test if the path exists
     if not os.path.exists(path):
-        raise ConfigError("can't chdir to %r" % val)
+        raise ConfigError("can't chdir to %r" % (val, ))
 
     return path
 
@@ -520,8 +520,10 @@ def validate_statsd_address(val):
 
 
 def validate_reload_engine(val):
+    val = validate_string(val)
+
     if val not in reloader_engines:
-        raise ConfigError("Invalid reload_engine: %r" % val)
+        raise ConfigError("Invalid reload_engine: %r" % (val, ))
 
     return val
 
@@ -2329,15 +2331,15 @@ def validate_header_map_behaviour(val):
         return
 
     if not isinstance(val, str):
-        raise TypeError("Invalid type for casting: %s" % val)
+        raise TypeError("Invalid type for casting: %s" % (val, ))
     if val.lower().strip() == "drop":
         return "drop"
     elif val.lower().strip() == "refuse":
         return "refuse"
     elif val.lower().strip() == "dangerous":
         return "dangerous"
     else:
-        raise ValueError("Invalid header map behaviour: %s" % val)
+        raise ValueError("Invalid header map behaviour: %s" % (val, ))
 
 
 class HeaderMap(Setting):

gunicorn/http/errors.py

@@ -19,7 +19,7 @@ def __init__(self, buf=None):
         self.buf = buf
 
     def __str__(self):
-        return "No more data after: %r" % self.buf
+        return "No more data after: %r" % (self.buf, )
 
 
 class ConfigurationProblem(ParseException):
@@ -28,7 +28,7 @@ def __init__(self, info):
         self.code = 500
 
     def __str__(self):
-        return "Configuration problem: %s" % self.info
+        return "Configuration problem: %s" % (self.info, )
 
 
 class InvalidRequestLine(ParseException):
@@ -37,23 +37,23 @@ def __init__(self, req):
         self.code = 400
 
     def __str__(self):
-        return "Invalid HTTP request line: %r" % self.req
+        return "Invalid HTTP request line: %r" % (self.req, )
 
 
 class InvalidRequestMethod(ParseException):
     def __init__(self, method):
         self.method = method
 
     def __str__(self):
-        return "Invalid HTTP method: %r" % self.method
+        return "Invalid HTTP method: %r" % (self.method, )
 
 
 class InvalidHTTPVersion(ParseException):
     def __init__(self, version):
         self.version = version
 
     def __str__(self):
-        return "Invalid HTTP Version: %r" % self.version
+        return "Invalid HTTP Version: %r" % (self.version, )
 
 
 class InvalidHeader(ParseException):
@@ -62,15 +62,15 @@ def __init__(self, hdr, req=None):
         self.req = req
 
     def __str__(self):
-        return "Invalid HTTP Header: %r" % self.hdr
+        return "Invalid HTTP Header: %r" % (self.hdr, )
 
 
 class InvalidHeaderName(ParseException):
     def __init__(self, hdr):
         self.hdr = hdr
 
     def __str__(self):
-        return "Invalid HTTP header name: %r" % self.hdr
+        return "Invalid HTTP header name: %r" % (self.hdr, )
 
 
 class UnsupportedTransferCoding(ParseException):
@@ -79,23 +79,23 @@ def __init__(self, hdr):
         self.code = 501
 
     def __str__(self):
-        return "Unsupported transfer coding: %r" % self.hdr
+        return "Unsupported transfer coding: %r" % (self.hdr, )
 
 
 class InvalidChunkSize(IOError):
     def __init__(self, data):
         self.data = data
 
     def __str__(self):
-        return "Invalid chunk size: %r" % self.data
+        return "Invalid chunk size: %r" % (self.data, )
 
 
 class ChunkMissingTerminator(IOError):
     def __init__(self, term):
         self.term = term
 
     def __str__(self):
-        return "Invalid chunk terminator is not '\\r\\n': %r" % self.term
+        return "Invalid chunk terminator is not '\\r\\n': %r" % (self.term, )
 
 
 class LimitRequestLine(ParseException):
@@ -121,7 +121,7 @@ def __init__(self, line):
         self.code = 400
 
     def __str__(self):
-        return "Invalid PROXY line: %r" % self.line
+        return "Invalid PROXY line: %r" % (self.line, )
 
 
 class ForbiddenProxyRequest(ParseException):
@@ -130,7 +130,7 @@ def __init__(self, host):
         self.code = 403
 
     def __str__(self):
-        return "Proxy request from %r not allowed" % self.host
+        return "Proxy request from %r not allowed" % (self.host, )
 
 
 class InvalidSchemeHeaders(ParseException):

gunicorn/util.py

@@ -575,7 +575,7 @@ def to_bytestring(value, encoding="utf8"):
     if isinstance(value, bytes):
         return value
     if not isinstance(value, str):
-        raise TypeError('%r is not a string' % value)
+        raise TypeError('%r is not a string' % (value, ))
 
     return value.encode(encoding)
 

tests/test_config.py

@@ -197,10 +197,10 @@ def test_reload_engine_validation():
     assert c.reload_engine == 'poll'
 
     pytest.raises(ConfigError, c.set, "reload_engine", "invalid")
-    pytest.raises(ConfigError, c.set, "reload_engine", tuple())
-    pytest.raises(ConfigError, c.set, "reload_engine", (1,2,3))
-    pytest.raises(ConfigError, c.set, "reload_engine", [])
-    pytest.raises(ConfigError, c.set, "reload_engine", 0)
+    pytest.raises(TypeError, c.set, "reload_engine", tuple())
+    pytest.raises(TypeError, c.set, "reload_engine", (1,2,3))
+    pytest.raises(TypeError, c.set, "reload_engine", [])
+    pytest.raises(TypeError, c.set, "reload_engine", 0)
 
 
 def test_callable_validation_for_string():