From d4d7da3acc17049cc0b71e6917cb718b5522fea7 Mon Sep 17 00:00:00 2001 From: Luke Faraone Date: Wed, 16 Jan 2013 11:16:32 -0500 Subject: [PATCH] Switch humbug-send to use "humbug" as the module. The old-style api.humbug is deprecated, so we rewrite the path for things to work correctly. (imported from commit 360282b70fab1ad9d9d517157fc4fe06f9acd6a2) --- bin/humbug-send | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/humbug-send b/bin/humbug-send index 36761fd..96d4fb6 100755 --- a/bin/humbug-send +++ b/bin/humbug-send @@ -60,14 +60,14 @@ def main(argv=None): %prog hamlet@example.com cordelia@example.com -m "Conscience doth make cowards of us all." """ - sys.path.append(os.path.join(os.path.dirname(__file__), os.path.join('..', '..'))) + sys.path.append(os.path.join(os.path.dirname(__file__), '..')) - import api.humbug + import humbug parser = optparse.OptionParser(usage=usage) # Grab parser options from the API common set - parser.add_option_group(api.humbug.generate_option_group(parser)) + parser.add_option_group(humbug.generate_option_group(parser)) parser.add_option('-m', '--message', help='Specifies the message to send, prevents interactive prompting.') @@ -96,7 +96,7 @@ def main(argv=None): if len(recipients) == 0 and not (options.stream and options.subject): parser.error('You must specify a stream/subject or at least one recipient.') - client = api.humbug.init_from_options(options) + client = humbug.init_from_options(options) if not options.message: options.message = sys.stdin.read()