Big cleanup, pyling warning, style, error

[mpd-sima.git] / sima / lib / http.py

diff --git a/sima/lib/http.py b/sima/lib/http.py
index 3b27bddbb3e99406f909681bd03da234a3be54ce..a87398b5d46ed991911260c3f528dd0d192db79b 100644 (file)
--- a/sima/lib/http.py
+++ b/sima/lib/http.py
@@ -45,7 +45,7 @@ def parse_uri(uri):
     return (groups[1], groups[3], groups[4], groups[6], groups[8])
 
 
-class CacheController(object):
+class CacheController:
     """An interface to see if request should cached or not.
     """
     CACHE_ANYWAY = False
@@ -66,7 +66,7 @@ class CacheController(object):
 
         # Could do syntax based normalization of the URI before
         # computing the digest. See Section 6.2.2 of Std 66.
-        request_uri = query and "?".join([path, query]) or path
+        request_uri = "?".join([path, query]) if query else path
         scheme = scheme.lower()
         defrag_uri = scheme + "://" + authority + request_uri
 
@@ -101,7 +101,7 @@ class CacheController(object):
         cc = self.parse_cache_control(request.headers)
 
         # non-caching states
-        no_cache = True if 'no-cache' in cc else False
+        no_cache = bool('no-cache' in cc)
         if 'max-age' in cc and cc['max-age'] == 0:
             no_cache = True
         # see if it is in the cache anyways