pvl.irker: drop --irker-target arg
authorTero Marttila <terom@paivola.fi>
Thu, 10 Jan 2013 17:49:49 +0200
changeset 72 7bb07131c2b5
parent 71 11b267e1b2b0
child 73 ef01c4639689
pvl.irker: drop --irker-target arg
pvl/irker.py
--- a/pvl/irker.py	Sat Jan 05 01:36:30 2013 +0200
+++ b/pvl/irker.py	Thu Jan 10 17:49:49 2013 +0200
@@ -12,29 +12,23 @@
 
     irker = optparse.OptionGroup(parser, 'Irker output')
     
-    irker.add_option('--irker-connect', metavar='URL',  default=connect,
+    irker.add_option('--irker', metavar='URL',  default=connect,
             help="Irker daemon URL")
 
-    irker.add_option('--irker-target', metavar='IRC',   default=target,
-            help="Irker target URL")
-
     return irker
 
-def apply (options, target=None) :
+def apply (options) :
     """
         Return Irker (XXX: target) from options.
     """
     
-    # XXX: None -> stdout
-    irk = Irker(options.irker_connect)
+    if options.irker :
+        # XXX: None -> stdout
+        irk = Irker(options.irker)
+    else :
+        irk = None
 
-    if options.irker_target :
-        target = options.irker_target
-
-    if target :
-        target = irk.target(target)
-
-    return irk, target
+    return irk
 
 def connect (host=None, port=None, family=socket.AF_UNSPEC, socktype=socket.SOCK_STREAM) :
     for af, st, proto, name, addr in socket.getaddrinfo(host, port, family, socktype) :