From: Avery Pennarun <apenwarr@gmail.com>
Date: Wed, 3 Mar 2010 04:42:45 +0000 (-0500)
Subject: bup.options: remove reference to bup.helpers.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f00d3529a7c70672709af1dca236fbb383221a47;p=packages%2Fb%2Fbup.git

bup.options: remove reference to bup.helpers.

This makes the module more easily reusable in other apps.
---

diff --git a/lib/bup/options.py b/lib/bup/options.py
index 7ae529f..caa6a65 100644
--- a/lib/bup/options.py
+++ b/lib/bup/options.py
@@ -1,5 +1,4 @@
-import textwrap, getopt, re
-from bup.helpers import *
+import sys, textwrap, getopt, re
 
 class OptDict:
     def __init__(self):
@@ -76,11 +75,11 @@ class Options:
         return ''.join(out).rstrip() + '\n'
     
     def usage(self):
-        log(self._usagestr)
+        sys.stderr.write(self._usagestr)
         sys.exit(97)
 
     def fatal(self, s):
-        log('error: %s\n' % s)
+        sys.stderr.write('error: %s\n' % s)
         return self.usage()
         
     def parse(self, args):