diff options
| -rwxr-xr-x | freebase/fcl/commands.py | 10 | ||||
| -rwxr-xr-x | freebase/fcl/fcl.py | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/freebase/fcl/commands.py b/freebase/fcl/commands.py index 73b649e..3e7ba4b 100755 --- a/freebase/fcl/commands.py +++ b/freebase/fcl/commands.py @@ -172,13 +172,13 @@ def cmd_ls(fb, path=None, long=False, timesort=False, revsort=False): #sys.stdout.write(' '.join([mk.value for mk in r['/type/namespace/keys']])) for mk in r['/type/namespace/keys']: - if (long): + if long: # trim off the /user/ creator = re.sub('^/user/', '', mk.link.creator) timestamp = mk.link.timestamp - out(mk.value, creator, timestamp) + fb.out(mk.value, creator, timestamp) else: - out(mk.value) + fb.out(mk.value) if 0: suffix = '' @@ -435,7 +435,7 @@ def cmd_dump(fb, id): else: extra = '' - out(k, id, name, type, extra) + fb.out(k, id, name, type, extra) def cmd_pget(fb, id, propid): @@ -642,7 +642,7 @@ def cmd_find(fb, qstr): results = fb.mss.mqlreaditer(q) for r in results: - out(r.id) + fb.out(r.id) def cmd_q(fb, qstr): diff --git a/freebase/fcl/fcl.py b/freebase/fcl/fcl.py index 812b7fe..3e51583 100755 --- a/freebase/fcl/fcl.py +++ b/freebase/fcl/fcl.py @@ -40,7 +40,6 @@ try: except ImportError: import json - from cmdutil import CmdException, log, out from fbutil import FbException, default_propkeys @@ -53,8 +52,6 @@ _cookiedir = None if os.environ.has_key('HOME'): _cookiedir = os.path.join(os.environ['HOME'], '.pyfreebase') - - class Command(object): def __init__(self, module, name, func): self.module = module @@ -83,6 +80,7 @@ class FclCommandHandler(object): self.cwid = '' self.progpath = 'fcl' self.commands = {} + self.out = out self.cookiefile = None if _cookiedir is not None: |