From 9b600830d2dcc73ccff17b648285cec76e3e6880 Mon Sep 17 00:00:00 2001 From: Adam Griffiths Date: Mon, 2 Nov 2020 14:41:44 +1100 Subject: [PATCH] Fix ConfigParser on py3, fix port/dbid not being cast Use six to import ConfigParser (it's lowercase in py3). Fix incorrect variable usage, should be _application. Fix redis config not being cast to ints like in ddns_plugin.py. --- Pipfile | 1 + ddns.tac | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Pipfile b/Pipfile index ea3e611..499458f 100644 --- a/Pipfile +++ b/Pipfile @@ -6,5 +6,6 @@ verify_ssl = true docker-compose = "*" [packages] +six = "*" txredisapi = "*" Twisted = "*" diff --git a/ddns.tac b/ddns.tac index 343cd07..1d6373c 100644 --- a/ddns.tac +++ b/ddns.tac @@ -1,14 +1,14 @@ import txredisapi from twisted.application import service, internet from twisted.names import dns -from ConfigParser import ConfigParser +from six.moves.configparser import ConfigParser from ddns.protocol import DDNSFactory def create_application(): _application = service.Application('ddns') - _collection = service.IServiceCollection(application) + _collection = service.IServiceCollection(_application) config = ConfigParser() config.read('ddns.ini') @@ -17,8 +17,8 @@ def create_application(): redis_client = txredisapi.lazyConnectionPool( host=config.get('redis', 'host'), - port=config.get('redis', 'port'), - dbid=config.get('redis', 'db') + port=int(config.get('redis', 'port')), + dbid=int(config.get('redis', 'db')) ) ddns_factory = DDNSFactory(redis_client)