Merge branch 'testing' of github.com:Rafiot/uwhoisd into testing

Conflicts:
	uwhoisd/__init__.py

.travis.yml

@@ -22,7 +22,7 @@ install:
   - popd
 
 script:
-  - coverage run --parallel-mode --source=uwhoisd uwhoisd/__init__.py extra/uwhoisd.ini &
+  - coverage run --parallel-mode --source=uwhoisd uwhoisd/__init__.py -c extra/uwhoisd.ini &
   - pid=$!
   - sleep 5
   - nosetests --with-coverage --cover-package=uwhoisd

travis_config/uwhoisd.ini

@@ -31,15 +31,6 @@ conservative=
     nz
     uk
 
-; Standalone python cache
-[cache]
-enable=false
-; Maximum number of items in the LFU cache.
-max_size=1024
-
-; Maximum time in seconds to cache an item for.
-max_age=500
-
 ; External Redis server cache
 [redis_cache]
 enable=true
@@ -1885,6 +1876,14 @@ db=1
 ; Servers
 whois.dns.lu=1 100
 
+[whowas]
+enable=true
+; Redis server configuration
+host=127.0.0.1
+port=6379
+db=2
+
+
 ; Some servers are broken, in that case, we just return default contact points.
 [broken]
 whois.nic.es='The spanish Whois is broken. Complains to: [email protected] [email protected]'

uwhoisd/__init__.py

@@ -89,7 +89,7 @@ def read_config(self, parser):
             whowas_host = parser.get('whowas', 'host')
             whowas_port = parser.getint('whowas', 'port')
             whowas_database = parser.getint('whowas', 'db')
-            self.redis_whowas = redis.StrictRedis(whowas_host, whowas_port, whowas_database, decode_response=True)
+            self.redis_whowas = redis.StrictRedis(whowas_host, whowas_port, whowas_database, decode_responses=True)
 
         self.recursion_patterns = {}
         for zone, pattern in parser.items('recursion_patterns'):