diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py index 0eab27f42..8c5f4525f 100644 --- a/letsencrypt/client/client.py +++ b/letsencrypt/client/client.py @@ -9,7 +9,6 @@ import string import sys import M2Crypto -import requests import zope.component from letsencrypt.client import acme @@ -227,7 +226,7 @@ class Client(object): """ if redirect is None: redirect = zope.component.getUtility( - intefaces.IDisplay).redirect_by_default() + interfaces.IDisplay).redirect_by_default() if redirect: self.redirect_to_ssl(vhost) diff --git a/letsencrypt/client/display.py b/letsencrypt/client/display.py index 9da2f78b7..c6d90b5f0 100644 --- a/letsencrypt/client/display.py +++ b/letsencrypt/client/display.py @@ -20,7 +20,7 @@ class NcursesDisplay(object): self.height = height def generic_notification(self, message): - self.dialog.msgbox(message, width=self.width, height=self.height) + self.dialog.msgbox(message, width=self.width) def generic_menu(self, message, choices, input_text=""): # Can accept either tuples or just the actual choices diff --git a/letsencrypt/client/revoker.py b/letsencrypt/client/revoker.py index b7eb69216..073362501 100644 --- a/letsencrypt/client/revoker.py +++ b/letsencrypt/client/revoker.py @@ -39,7 +39,7 @@ class Revoker(object): zope.component.getUtility(interfaces.IDisplay).generic_notification( "You have successfully revoked the certificate for " - "%s" % cert["cn"], width=70, height=9) + "%s" % cert["cn"]) self.remove_cert_key(cert) self.list_certs_keys() diff --git a/letsencrypt/scripts/main.py b/letsencrypt/scripts/main.py index 152db8c03..8aeb43136 100755 --- a/letsencrypt/scripts/main.py +++ b/letsencrypt/scripts/main.py @@ -132,7 +132,7 @@ def main(): def display_eula(): """Displays the end user agreement.""" with open('EULA') as eula_file: - if not zope_component.getUtility(interfaces.IDisplay).generic_yesno( + if not zope.component.getUtility(interfaces.IDisplay).generic_yesno( eula_file.read(), "Agree", "Cancel"): sys.exit(0) @@ -147,7 +147,7 @@ def choose_names(installer): # This function adds all names # found within the config to self.names # Then filters them based on user selection - code, names = zope_component.getUtility( + code, names = zope.component.getUtility( interfaces.IDisplay).filter_names(get_all_names(installer)) if code == display.OK and names: # TODO: Allow multiple names once it is setup