Merge lp:~chromakode/boots/localization into lp:~ken-brotherton/boots/local2

[Max Goodhart]

Merged with the latest boots trunk. Localization install code forthcoming.

[lp:~chromakode/boots/localization]

117. By Max Goodhart on 2010-03-07

Fix a couple translatable strings in client_config.py.

118. By Max Goodhart on 2010-03-07

Fix translatable strings again.

119. By Max Goodhart on 2010-03-07

Localize boots.api.

120. By Max Goodhart on 2010-03-07

Merge and localize latest updates to trunk.

121. By Max Goodhart on 2010-03-07

Update potfile.

122. By Max Goodhart on 2010-03-07

Update localization README.

123. By Max Goodhart on 2010-03-07

Fix another translatable string that slipped through.

=== modified file 'boots/api/__init__.py'
--- boots/api/__init__.py	2009-12-22 00:12:18 +0000
+++ boots/api/__init__.py	2010-03-07 09:23:23 +0000
@@ -0,0 +1,1 @@
+from boots.lib import _, n_
\ No newline at end of file

=== modified file 'boots/api/api.py'
--- boots/api/api.py	2010-02-27 05:40:10 +0000
+++ boots/api/api.py	2010-03-07 09:23:23 +0000
@@ -30,37 +30,63 @@
 
 import time
 from boots.api import errors
-from drizzle import db
+from boots.api.nodes.node import Status
+from boots.api import _, n_
+
+_server_classes = []
+
+def extract_field_indexes(cursor_description):
+    """Returns a dictionary which maps field names to their indexes."""
+    return dict(zip((field[0] for field in cursor_description), range(0, len(cursor_description))))
+
+class Rows(list):
+    """Represents a chunk of rows."""
+    def __init__(self, sequence, field_indexes):
+        super(Rows, self).__init__(sequence)
+        self.field_indexes = field_indexes
+
+class ResultInfo(Status):
+    pass
 
 class Server(object):
     """Represents a connection to a database server.
     
     This object is used to execute commands on a remote server."""
 
-    def __init__(self, hostname, port, auth):
+    def __init__(self, dbapi_module, hostname, port, auth):
         """Initialize a Server object.
         
         hostname should be a string.
         port should be a positive integer value.
         auth should be a dictionary possibly containing keys:
         'username', 'password', and 'database' mapping to their
-        appropriate string values."""    
+        appropriate string values."""
+        self.db = dbapi_module    
         self.hostname = hostname
         self.port = port
         self.auth = auth
         self._connection = None
 
+    def __str__(self):
+        return "{0}:{1}".format(self.hostname, self.port)
+
+    def _connect(self):
+        return self.db.connect(
+            host     =  self.hostname,  
+            port     =  self.port,
+            username =  self.auth.get("username", ""),
+            password =  self.auth.get("password", ""),
+            database =  self.auth.get("database", ""))
+
     def connect(self):
         """Establishes database connection.
 
         Connect to the database server whose details were provided through
         the __init__ method."""
-        self._connection = db.connect(
-            host     =  self.hostname,  
-            port     =  self.port,
-            username =  self.auth.get('username', ""),
-            password =  self.auth.get('password', ""),
-            database =  self.auth.get('database', ""))
+        try:
+            self._connection = self._connect()
+        except self.db.Error:
+            raise errors.ConnectionError(_("Could not connect to {0}").format(self))
 
     @property
     def is_connected(self): 
@@ -72,38 +98,60 @@
     def _check_connected(self):
         """Raise a ProgrammingError if the Connection has been closed."""
         if not self.is_connected:
-            raise errors.ConnectionError("Connection closed")
+            raise errors.ConnectionError(_("Connection closed"))
 
     def disconnect(self):
         self._check_connected()
         """Disconnect from the connected database server."""
         self._connection.close()
         self._connection = None
+        
+    def _execute(self, query):
+        cursor = self._connection.cursor()
+        cursor.execute(query)
+        return cursor
     
     def execute(self, query):
-        #FIXME: I don't like how this is phrased, but cannot right now think of a better way to do it.
-        #FIXME: Gotta come back to that, I think.
-        """Executes a query, returning an iterator of resulting rows.
-        
-        The resulting rows are packaged in a 'packet' which is a dict:
-        {"__server_execute_sql_query": query,
-         "info": meta data,
-         "result": chunk of rows (list of tuples)}"""
-         
+        """Executes a query, returning an iterator of resulting rows."""
         self._check_connected()
-        cursor = self._connection.cursor(convert=False)
         begin_time = time.time()
-        cursor.execute(query)
+        
+        try:
+            cursor = self._execute(query)
+        except errors.LostConnectionError as lost_e:
+            # FIXME: this is NOT thread safe
+            # Attempt to reconnect and retry
+            yield Status(_("Lost connection to {0}. Reconnecting...").format(self))
+            
+            if self.is_connected:
+                self.disconnect()
+                            
+            try:
+                self.connect()
+                cursor = self._execute(query)
+            except Exception as e:
+                lost_e.reconnect_exception = e
+                raise lost_e
+            else:
+                yield Status(_("Reconnected."))
+            
         if cursor.description:
+            field_indexes = extract_field_indexes(cursor.description)
+            
             while True:
                 chunk = cursor.fetchmany(256)
-                packet = {"__server_execute_sql_query": query,
-                          "info": cursor.description,
+                # FIXME: Eventually it would be good to implement chunk packeting
+                # as a generic nodes feature.
+                if chunk:
+                    yield Rows(chunk, field_indexes)
+                else:
+                    break
+                
+        yield ResultInfo({"description": cursor.description,
+                          "row_count": cursor.rowcount,
                           "begin_time": begin_time,
-                          "result": chunk}
-                yield packet
-                if not chunk:
-                    return
+                          "end_time": time.time()})
+        return
                 
     @property
     def server_version(self):
@@ -115,7 +163,61 @@
         self._check_connected()
         return self._connection.protocol_version
 
+try:
+    import drizzle.db
+    class DrizzleServer(Server):
+        def __init__(self, hostname, port, auth):
+            Server.__init__(self, drizzle.db, hostname, port, auth)
+            
+        def _execute(self, query):
+            try:
+                cursor = self._connection.cursor(convert=False)
+                cursor.execute(query)
+            except drizzle.errors.LostConnectionError:
+                raise errors.LostConnectionError(server=self)
+            else:
+                return cursor
+            
+except ImportError:
+    pass
+else:
+    _server_classes.append(DrizzleServer)
+
+try:
+    import MySQLdb
+    import MySQLdb.converters
+    class MySQLServer(Server):
+        def __init__(self, hostname, port, auth):
+            Server.__init__(self, MySQLdb, hostname, port, auth)
+
+        def _connect(self):
+            """Establishes database connection.
+
+            Connect to the database server whose details were provided through
+            the __init__ method."""
+
+            converter = self.db.converters.conversions.copy()
+            for x in range(0,256):
+                converter.pop(x, None)
+            if self.auth["database"] == None:
+                self.auth["database"] = ""
+            return self.db.connect(
+                host     =  self.hostname,  
+                port     =  self.port,
+                user     =  self.auth.get("username", ""),
+                passwd   =  self.auth.get("password", ""),
+                db       =  self.auth.get("database", ""),
+                conv     =  converter)
+
+        @property
+        def server_version(self):
+            self._check_connected()
+            return self._connection.get_server_info()
+except ImportError:
+    pass
+else:
+    _server_classes.append(MySQLServer)
+
 class Query(str):
     def substitute(self, rows): pass
-
-class Row(dict): pass
+    

=== modified file 'boots/api/constructors.py'
--- boots/api/constructors.py	2010-02-27 05:40:10 +0000
+++ boots/api/constructors.py	2010-03-07 09:23:23 +0000
@@ -21,7 +21,11 @@
 #
 # ##### END LICENSE BLOCK #####
 
+import re
+
+from boots.api.api import Rows, ResultInfo
 from boots.api.nodes.node import NodeGraph, SyncNode, IteratorNode
+from boots.api import _, n_
 
 _constructors = {}
 
@@ -29,7 +33,7 @@
     """Allow the function constructor to be used from PipedSQL under name.  constructor is a
     function that takes any number of strings as arguments and returns a node."""
     if name in _constructors:
-        raise KeyError('A constructor with name ' + name + ' already exists')
+        raise KeyError(_('A constructor with name {0} already exists').format(name))
 
     _constructors[name] = constructor
 
@@ -40,7 +44,7 @@
 def construct(name, *arguments):
     """Contructs a node using the given name and arguments."""
     if name not in _constructors:
-        raise KeyError('There is no constructor with the name' + ' {0}.'.format(name))
+        raise KeyError(_('There is no constructor with the name {0}.').format(name))
     
     return _constructors[name](*arguments)
 
@@ -52,18 +56,105 @@
 
     return register_constructor_with_name
 
+@register('csv_in')
+def csv_input_file_node(path):
+    """Constructs a node that reads from a csv file and then sends the word to its outputs."""
+    input_file = open(path)
+    
+    def read_iterator():
+        for line in input_file:
+            for word in line.split(','):
+                yield word
+
+    return IteratorNode(read_iterator())
+
 @register('csv_out')
 def csv_output_file_node(path):
-    """Constructs a node that writes each object it is passed to a
-    file and then sends the object to its outputs."""
-    output_file = open(path, 'w')
-    
-    def write(result):
-        if type(result) is dict and "__server_execute_sql_query" in result:
-            output_file.write('\n'.join(','.join(row) for row in result['result']))
-        else:
-            output_file.write(str(result) + '\n')
-        
-        return StopIteration
-    
-    return SyncNode(write)
+    """Constructs a node that writes each object it is passed to a file and then sends the object to
+    its outputs."""
+    class CSVOutput(object):
+        def __init__(self):
+            self.write_comma = False
+            self.output_file = open(path, 'w')
+        
+        def write(self, result):
+            if type(result) is Rows:
+                self.output_file.write('\n'.join(','.join(row) for row in result))
+            else:
+                if self.write_comma:
+                    self.output_file.write(',')
+                    
+                self.output_file.write(str(result))
+
+                if not isinstance(result, str) or not result.endswith('\n'):
+                    self.write_comma = True
+                else:
+                    self.write_comma = False
+
+            self.output_file.flush()
+            
+    csv_output = CSVOutput()
+    return SyncNode(csv_output.write)
+
+@register('sink')
+def sink_node():
+    """Constructs a node that ignores all input."""
+    return SyncNode(lambda x: None)
+
+@register('sub')
+def substitute_node(pattern, replacement, field = None):
+    """Constructs a node that replaces any text matching pattern with replacement as if by re.sub.
+    field can be used to specify the name of the field to perform substitution against.  The default
+    is to substitute against all fields."""
+
+    regexp = re.compile(pattern)
+
+    def sub(result):
+        if type(result) is Rows:
+            field_indexes = result.field_indexes
+            
+            if field:
+                index = field_indexes[field]
+                
+                def sub_field(row, replacement):
+                    row = list(row)
+                    row[index] = replacement
+                    return tuple(row)
+        
+                return Rows((sub_field(row, regexp.sub(replacement, row[index])) for row in result), field_indexes)
+            else:
+                return Rows((tuple(regexp.sub(replacement, field) for field in row) for row in result), field_indexes)
+            
+        elif isinstance(result, str):
+            return regexp.sub(replacement, result)
+        else:
+            return result
+
+    return SyncNode(sub)
+
+@register('filter')
+def filter_node(pattern, field = None):
+    """Constructs a node that allows text to pass through only if it matches pattern.  A row is
+    allowed to pass through if at least one of its fields matches pattern.  field can be used to
+    specify the name of the field to perform substitution against.  The default is to substitute
+    against all fields."""
+
+    regexp = re.compile(pattern)
+
+    def filter(result):
+        if type(result) is Rows:
+            field_indexes = result.field_indexes
+            
+            if field:
+                index = field_indexes[field]
+                return Rows((row for row in result if regexp.match(row[index])), field_indexes)
+            else:
+                return Rows((row for row in result if any(map(regexp.match, row))), field_indexes)
+            
+        elif isinstance(result, str):
+            if regexp.match(result):
+                return result
+        else:
+            return result
+
+    return SyncNode(filter)

=== modified file 'boots/api/errors.py'
--- boots/api/errors.py	2010-02-27 05:40:10 +0000
+++ boots/api/errors.py	2010-03-07 09:23:23 +0000
@@ -22,15 +22,39 @@
 # ##### END LICENSE BLOCK #####
 
 import exceptions
+import traceback
+
+from boots.api import _, n_
 
 class BootsError(exceptions.StandardError):
-    """Base class of boots error exceptions"""
-    pass
-
-class ConsoleError(BootsError):
-    """Errors to be displayed to be displayed on the console"""
-    pass
-
-class ConnectionError(ConsoleError):
-    """Errors related to server connections"""
-    pass
+    """Base class of boots error exceptions."""
+    pass
+
+class BootsWarning(exceptions.Warning):
+    """Base class of boots warnings."""
+    pass
+
+class ConnectionError(BootsError):
+    """Errors related to server connections."""
+    pass
+
+class LostConnectionError(ConnectionError):
+    """Raised when a connection is lost."""
+    def __init__(self, msg=None, server=None, reconnect_exception=None):
+        self.msg = msg
+        self.server = server
+        self.reconnect_exception = reconnect_exception
+    
+    def __str__(self):
+        msg = []
+        if self.msg:
+            msg.append(self.msg)
+        else:
+            msg.append(_("Lost connection to {0}").format(self.server))
+
+        if self.reconnect_exception:
+            exc_lines = traceback.format_exception_only(type(self.reconnect_exception), self.reconnect_exception)
+            exc_text = ". ".join(line.strip() for line in exc_lines)
+            msg.append(_("(Exception upon reconnect: {0})").format(exc_text))
+            
+        return " ".join(msg)

=== modified file 'boots/api/nodes/node.py'
--- boots/api/nodes/node.py	2010-03-02 00:45:59 +0000
+++ boots/api/nodes/node.py	2010-03-07 09:23:23 +0000
@@ -21,12 +21,13 @@
 #
 # ##### END LICENSE BLOCK #####
 
+from __future__ import print_function
+
+import sys
 from Queue import Queue
-from itertools import chain, tee, repeat
+from itertools import chain, tee, repeat, ifilter
 from threading import Thread, Event, Lock
 from types import GeneratorType
-import gettext
-gettext.install("boots",localedir=None,unicode=1)
 
 def catch_exceptions(iterable):
     try:
@@ -34,6 +35,11 @@
             yield x
     except Exception as e:
         yield e
+        
+def trace(msg, iterable):
+    for x in iterable:
+        print(msg, repr(x), file=sys.stderr)
+        yield x
 
 def alternate_iterators(*iterables):
     """Iterate over the given iterables, taking turns.
@@ -62,7 +68,7 @@
         yield x
 
 def imap_flatten(func, iterable):
-    """Map a function over the iterables, flattening the result.""" 
+    """Map a function over the iterable, flattening the result."""
     for x in iterable:
         result = func(x)
         for item in flatten(result):
@@ -70,27 +76,27 @@
 
 # FIXME: need a thread safe tee here, perhapse "safetee"?
 
-class BaseNode(object):
-    """Base class for the node system."""
-
-    def __init__(self, name=None, inputs=None, outputs=None):
+class Status(object):
+    def __init__(self, value):
+        self.value = value
+        
+    def __str__(self):
+        return str(self.value)
+        
+def filter_default(value):
+    return not isinstance(value, Status) and not isinstance(value, Exception)
+
+def filter_none(value):
+    return True
+
+class PrimitiveNode(object):
+    def __init__(self, name=None):
         """Constructor of the base node object.
 
         Initializes the node object.
         Takes the node name, inputs and outputs as parameters.
         """
         self.name = name
-        self._finalized = False
-        
-        if inputs:
-            self.inputs = set(inputs)
-        else:
-            self.inputs = set()
-        
-        if outputs:
-            self.outputs = set(outputs)
-        else:
-            self.outputs = set()
         
     @property
     def name(self):
@@ -117,6 +123,28 @@
         For the base node object, returns NONE."""
         return None
     
+class BaseNode(PrimitiveNode):
+    """Base class for the node system."""
+
+    def __init__(self, name=None, inputs=None, outputs=None):
+        """Constructor of the base node object.
+
+        Initializes the node object.
+        Takes the node name, inputs and outputs as parameters.
+        """
+        PrimitiveNode.__init__(self, name)
+        self._finalized = False
+        
+        if inputs:
+            self.inputs = set(inputs)
+        else:
+            self.inputs = set()
+        
+        if outputs:
+            self.outputs = set(outputs)
+        else:
+            self.outputs = set()
+
     def finalize(self):
         """Finalizes node setup.
 
@@ -240,33 +268,40 @@
         assert input_edges == output_edges, "Graph integrity check failed."
         return output_edges
         
-    def add(self, *nodes):
+    def add(self, *nodes, **flags):
         """Add individual nodes to the collection.
 
         Accepts a list of nodes to be added to the collection."""
-        return self._add(False, nodes)
+        self._add(False, nodes)
+        if flags.get("input", False):
+            for node in nodes:
+                self.input_link.connect_output(node)
+        elif flags.get("output", False):
+            for node in nodes:
+                node.connect_output(self.output_link)
+        
+        return self
     
     def add_input(self, *nodes):
         """Adds nodes to the input link.
 
         Accepts a list of nodes and adds them to the input_link of this
         graph."""
-        self.add(*nodes)
-        for node in nodes:
-            self.input_link.connect_output(node)
+        self.add(*nodes, input=True)
+        return self
         
     def add_output(self, *nodes):
         """Adds nodes to the output link.
 
         Accepts a list of nodes and adds them to the output_link of this
         graph."""
-        self.add(*nodes)
-        for node in nodes:
-            node.connect_output(self.output_link)
+        self.add(*nodes, output=True)
+        return self
         
     def add_connected(self, *nodes):
         """Add all connected nodes to the collection."""
-        return self._add(True, nodes)
+        self._add(True, nodes)
+        return self
 
     def _add(self, traverse, nodes):
         if traverse:
@@ -278,8 +313,6 @@
             self.nodes.add(node)
             if node.name:
                 self.names[node.name] = node
-        
-        return nodes
     
     def link_output(self, output_graph):
         """Link output link of this node graph to input of another."""
@@ -346,6 +379,9 @@
         # Notify all nodes that their connections are final.
         for node in self.nodes:
             node.finalize()
+            
+        self.input_link.finalize()
+        self.output_link.finalize()
                 
         self._finalized = True
         
@@ -370,14 +406,21 @@
                 self.output_link.put(data)
 
 class ActionNode(BaseNode):
-    def __init__(self, action, name=None, inputs=None, outputs=None, include_stop=False):
+    def __init__(self, action, name=None, inputs=None, outputs=None, filter=None):
         BaseNode.__init__(self, name, inputs, outputs)
+        self.filter = filter or filter_default
         self.action = action
-        
+    
+    def _do_action(self, data):
+        if self.filter(data):
+            return self.action(data)
+        else:
+            return data
+    
     def _run(self):
         for data in self._iter_inputs():
             try:
-                for result in flatten(self.action(data)):
+                for result in flatten(self._do_action(data)):
                     self._put_outputs(result)
             except Exception as e:
                 self.put_outputs(e)
@@ -392,7 +435,7 @@
 class QueueNode(BaseNode):
     """Thread-safe queue that buffers pushed data for pull access."""
     
-    def __init__(self, name=None, inputs=None, outputs=None, include_stop=False):
+    def __init__(self, name=None, inputs=None, outputs=None):
         BaseNode.__init__(self, name, inputs, outputs)
         self._queue = Queue()
         self._unfinished_inputs = None
@@ -413,31 +456,39 @@
             else:
                 yield data
             
-class LinkNode(BaseNode):
-    """Link node to connect to nodes in a dynamic, thread-safe manner."""
-
-    def __init__(self, name=None, inputs=None, outputs=None, mortal=False):
+class BaseLinkNode(object):
+    def __init__(self):
         """Initializes link node."""
-        BaseNode.__init__(self, name, inputs, outputs)
         self.input_links = set()
+        self.output_links = set()
         self.input_lock = Lock()
-        self.output_links = set()
         self.output_lock = Lock()
-        self.mortal = mortal
-        
+    
     def link_output(self, output_link):
         """Links own output to another unit's input link."""
-        with self.input_lock:
-            with output_link.output_lock:
+        with self.output_lock:
+            with output_link.input_lock:
                 self.output_links.add(output_link)
                 output_link.input_links.add(self)
         
     def unlink_output(self, output_link):
         """Unlinks own output from another unit's input link."""
-        with self.input_lock:
-            with output_link.output_lock:
+        with self.output_lock:
+            with output_link.input_lock:
                 self.output_links.remove(output_link)
                 output_link.input_links.remove(self)
+            
+class LinkNode(BaseNode, BaseLinkNode):
+    """Link node to connect to nodes in a dynamic, thread-safe manner."""
+
+    def __init__(self, name=None, inputs=None, outputs=None, mortal=False):
+        """Initializes link node."""
+        BaseNode.__init__(self, name, inputs, outputs)
+        BaseLinkNode.__init__(self)
+        self.mortal = mortal
+        
+    def _finalize(self):
+        self._input_iter = self._iter_inputs()
                 
     def put(self, data):
         """Push data through the link."""
@@ -471,23 +522,57 @@
                     yield
         
     def __iter__(self):
-        return alternate_iterators(self._iter_inputs(), self._iter_links())
-
+        return alternate_iterators(self._input_iter, self._iter_links())
+
+class LinkStackNode(PrimitiveNode, BaseLinkNode):
+    """Link node to read input from a stack of nodes, popping off the stack
+    when a node finishes."""
+
+    def __init__(self, name=None):
+        """Initializes link node."""
+        PrimitiveNode.__init__(self, name)
+        BaseLinkNode.__init__(self)
+        self.input_stack = list()
+        
+    def push_input(self, input_link):
+        with self.input_lock:
+            with input_link.output_lock:
+                self.input_stack.append(input_link)
+                input_link.output_links.add(self)
+        
+    def pop_input(self):
+        with self.input_lock:
+            input_link = self.input_stack.pop()
+            with input_link.output_lock:
+                input_link.output_links.remove(self) 
+
+    def __iter__(self):
+        while True:
+            with self.input_lock:
+                top_input = self.input_stack[-1] if self.input_stack else None
+                    
+            if top_input:
+                try:
+                    yield iter(top_input).next()
+                except StopIteration:
+                    self.pop_input()
+            else:
+                return
+                    
 class SyncNode(ActionNode):
     """Synchronous lazy pull-based node."""
     def _finalize(self):
         if self.inputs:
-            self._input_iter = self._iter_inputs()
+            self._result_iter = imap_flatten(self._do_action, self._iter_inputs())
         else:
-            self._input_iter = repeat(None)
-        self._result_iter = catch_exceptions(imap_flatten(self.action, self._input_iter))
-        self._tees = list(tee(self._result_iter, len(self.outputs)))
+            self._result_iter = self.action
+        self._tees = list(tee(catch_exceptions(self._result_iter), len(self.outputs)))
     
     def put(self, data):
         if data is StopIteration:
             result = StopIteration
         else:
-            result = self.action(data)
+            result = self._do_action(data)
         
         self._put_outputs(result)
         
@@ -501,19 +586,16 @@
         self._run()
 
 class IteratorNode(SyncNode):
-    def __init__(self, value, name=None, inputs=None, outputs=None, include_stop=False):
+    def __init__(self, value, name=None, inputs=None, outputs=None, filter=None):
         self.iterator = iter(value)
-        SyncNode.__init__(self, self.advance, name, inputs, outputs, include_stop)
-        
-    def advance(self, data):
-        return self.iterator.next()
+        SyncNode.__init__(self, self.iterator, name, inputs, outputs, filter)
 
 class AsyncNode(ActionNode, Thread):
     """Asynchronous push-based node. Runs in a thread."""
     
-    def __init__(self, action=None, name=None, inputs=None, outputs=None, include_stop=False, profile=False):
+    def __init__(self, action=None, name=None, inputs=None, outputs=None, filter=None, profile=False):
         Thread.__init__(self)
-        ActionNode.__init__(self, action, name, inputs, outputs, include_stop)
+        ActionNode.__init__(self, action, name, inputs, outputs, filter)
         if action:
             self.action = action
         else:
@@ -544,12 +626,12 @@
 def test():
     def wait(x):
         import time
-        print "waiting: {0}".format(x)
+        print("waiting: {0}".format(x))
         time.sleep(1)
         return x
     
     def print_it(foo):
-        print "printing: {0}".format(foo)
+        print("printing: {0}".format(foo))
         return foo
     
     nodes = NodeGraph.from_sequence([SyncNode(lambda x:xrange(10), name="count"),
@@ -557,9 +639,9 @@
                                      SyncNode(print_it, name="print"),
                                      QueueNode(name="out")])
     nodes.start()
-    print nodes.edges()
+    print(nodes.edges())
     for result in nodes["out"]:
-        print result
+        print(result)
         
 if __name__ == "__main__":
     test()

=== modified file 'boots/app/__init__.py'
--- boots/app/__init__.py	2009-12-23 20:58:28 +0000
+++ boots/app/__init__.py	2010-03-07 09:23:23 +0000
@@ -1,1 +1,1 @@
-__all__ = ["boots", "config", "info"]
+from boots.lib import _, n_
\ No newline at end of file

=== modified file 'boots/app/client_config.py'
--- boots/app/client_config.py	2010-03-02 00:45:59 +0000
+++ boots/app/client_config.py	2010-03-07 09:23:23 +0000
@@ -26,9 +26,32 @@
 options/arguments."""
 
 import optparse
-import os
+import os, os.path
 import info
-from boots.util import set_gettext
+
+from boots.app import _, n_
+
+def find_executable(name):
+    # Search algorithm adapted from os._execvpe 
+    head, tail = os.path.split(name)
+    if head and os.path.exists(name):
+        return name
+    else:
+        if 'PATH' in os.environ:
+            envpath = os.environ['PATH']
+        else:
+            envpath = os.defpath
+        PATH = envpath.split(os.pathsep)
+        for dir in PATH:
+            fullname = os.path.join(dir, name)
+            if os.path.exists(fullname):
+                return fullname
+
+def get_auto_pager():
+    if find_executable("less"):
+        return "less -XF"
+    elif find_executable("more"):
+        return "more"    
 
 class ClientConfig(object):
     """Class used to read client configuration from files and the cli."""
@@ -42,7 +65,7 @@
         self._defaults = {"command":            None,
                           "database":           None,
                           "script":             None,
-                          'lingo':              'sql',
+                          "lingo":              "sql",
                           "rcfile":             info.RCFILE,
                           "host":               "localhost",
                           "port":               9306,
@@ -50,6 +73,8 @@
                           "password":           False,
                           "prompt1":            "> ",
                           "prompt2":            "+ ",
+                          "pager":              None,
+                          "pager_command":      None,
                           "terminating_char":   ";",
                           "history_length":     100,
                           "history_file":       os.path.expanduser("~/.boots_history")}
@@ -110,6 +135,11 @@
                                     type = "string",
                                     dest = "password",
                                     help = _("Connect using password. If none is given, query for password"))
+        self._cli_parser.add_option("--pager",
+                                    action = "store",
+                                    type = "string",
+                                    dest = "pager",
+                                    help = _("Pipe query results to the specified pager."))
         self._cli_parser.add_option("-t", "--terminatingchar",
                                     action = "store",
                                     type = "string",
@@ -155,6 +185,14 @@
         
         self._dict.update(from_file)
         self._dict.update(from_cli)
+        self._interpret_options()
+ 
+    def _interpret_options(self):
+        # Interpret options
+        if self["pager"] == "auto":
+            self["pager_command"] = get_auto_pager()
+        elif self["pager"]:
+            self["pager_command"] = self["pager"]
 
     def get_file_conf(self, filepath):
         """Read a configuration from the specified file. Return a dict."""
@@ -164,11 +202,11 @@
         except IOError:
             if filepath != info.RCFILE:
                 # Only print an error if a non-default rc file was specified.
-                print("rcfile {0} "+_("not found").format(filepath))
+                print(_("rcfile {0} not found").format(filepath))
         except SyntaxError:
-            print("rcfile {0} "+_("contains a syntax error").format(filepath))
+            print(_("rcfile {0} contains a syntax error").format(filepath))
         except Exception as e:
-            print("rcfile {0} "+_("contains an error:")+" {1}".format(filepath, e))
+            print(_("rcfile {0} contains an error: {1}").format(filepath, e))
         return file_dict
 
     def get_cli_conf(self):

=== modified file 'boots/lib/__init__.py'
--- boots/lib/__init__.py	2009-12-22 00:12:18 +0000
+++ boots/lib/__init__.py	2010-03-07 09:23:23 +0000
@@ -0,0 +1,4 @@
+import gettext
+translation = gettext.translation("boots", fallback=True)
+_ = translation.lgettext
+n_ = translation.lngettext
\ No newline at end of file

=== modified file 'boots/lib/console.py'
--- boots/lib/console.py	2010-03-02 00:45:59 +0000
+++ boots/lib/console.py	2010-03-07 09:23:23 +0000
@@ -24,9 +24,11 @@
 """This module provides the boots Console class. This class is the core
 driver of any boots client."""
 
+import sys
+
 from boots.api import api
-from boots.api.errors import ConsoleError
-from boots.api.nodes import node
+from boots.api.errors import BootsError, BootsWarning, ConnectionError
+from boots.api.nodes.node import NodeGraph, IteratorNode, LinkStackNode
 from boots.lib.ui.plain import PlainUI
 from boots.lib.ui.generic import ScriptDriver, StringDriver, StdoutPresenter
 from boots.lib.ui.components.help import HelpTopic, QueryIndexTopic
@@ -34,14 +36,17 @@
 from boots.lib.hook import Hooks
 from boots.lib.lingos.lingo import lingo_registry
 from boots.lib.lingos import bash_external
-from boots.lib.lingos.lisp import lisp
 from boots.lib.lingos import python
 from boots.lib.lingos import piped_sql
 from boots.lib.lingos import sql
-from boots.util import set_gettext
+from boots.lib import _, n_
+try:
+    from boots.lib.lingos.lisp import lisp
+except ImportError:
+    # Allow the lisp lingo import to fail if Ply is not installed.
+    pass
 import sys
 
-
 # Utility function.
 def iterable(obj):
     """Returns True if obj is iterable; otherwise, False is returned."""
@@ -50,6 +55,18 @@
         return True
     except TypeError:
         return False
+    
+class ConsoleError(BootsError):
+    """Errors to be displayed on the console."""
+    pass
+
+class InternalError(BootsError):
+    """Errors to be displayed on the console."""
+    def __init__(self, exception):
+        self.exception = exception
+        
+    def __str__(self):
+        return _("Boots encountered an internal error: {0}").format(self.exception)
 
 class Console(object):    
     def __init__(self, config, welcome_msg=None):
@@ -67,7 +84,9 @@
             '\quit':       self.quit,
             '\help':       self.show_help,
             '\h':          self.show_help,
-            'help':        self.show_help})
+            'help':        self.show_help,
+            'source':      self.meta_source,
+            '\.':          self.meta_source,})
         self.metacommandmanager.add(self.metacommands)
         
         self.servers = []
@@ -86,27 +105,31 @@
             self.driver = self.ui
             
         if hasattr(self.ui, "metacommands"):
-            self.metacommandmanager.add(self.ui.metacommands)
+            result = self.metacommandmanager.add(self.ui.metacommands)
+            if isinstance(result, BootsWarning):
+                self._display_error(result)
         if hasattr(self.ui, "help"):
             self.help["ui"] = self.ui.help
+            
+        self.driver_stack = LinkStackNode() 
         
         self.hooks["load"].call()
 
     def _init_help(self):
-        self.help = HelpTopic("boots", "Boots Help", "Help", _("""
-            Boots is a flexible, extensible, and multilingual shell for working with databases. To read more about a subtopic, use `help <topic>`."""))
+        self.help = HelpTopic("boots", _("Boots Help"), _("Help"),
+            description = _("Boots is a flexible, extensible, and multilingual shell for working with databases. To read more about a subtopic, use `help <topic>`."))
         
         self.help["commands"] = QueryIndexTopic("commands", None, 
                                                 _("List of Boots commands."),
                                                 query=("commands",))
         
-        self.help["commands"].add("\quit", "quit", _("Quit boots."))
-        self.help["commands"].add("\help", "help", _("Show help for a topic."), _("""
-            help <topic>
-            Show help for \"topic\"."""))
+        self.help["commands"].add("\quit", _("quit"), _("Quit boots."))
+        self.help["commands"].add("\help", _("help"), _("Show help for a topic."),
+            description = _("help <topic>\n"
+                            "Show help for \"topic\"."))
             
-        self.help.add("lingos", "Lingos", _("Documentation for loaded lingos."), _("""
-            A lingo is a command language usable within Boots."""))
+        self.help.add("lingos", _("Lingos"), _("Documentation for loaded lingos."),
+            description = _("A lingo is a command language usable within Boots."))
 
     def input_complete(self, command, lingo):
         if self.metacommands.get_metacommand(command) is not None:
@@ -117,24 +140,37 @@
             return command
                       
     def run(self, command, lingo="sql"):
-        if lingo in self.lingos:
-            return self.lingos[lingo].execute(command)
+        if not lingo in self.lingos:
+            self._display_error(ConsoleError(_("Invalid lingo \"{0}\" specified.").format(lingo)))
+            return
+        
+        result_data = self.lingos[lingo].execute(command)
+        result = self.lingos[lingo].present(result_data)
+        if isinstance(result, NodeGraph):
+            result_graph = result
         else:
-            return ConsoleError(_("Invalid lingo")+" \"{0}\" "+_("specified.").format(lingo))
+            result_graph = NodeGraph() 
+            if isinstance(result, (str, Exception)) or not iterable(result):
+                result = iter([result])
+            result_graph.add_output(IteratorNode(result))
+
+        result_graph.link_output(self.presenter.presenter_graph)
+        result_graph.start()
+        result_graph.run()
+        return result_data
 
     def connect(self, host, port, database):
         try:
-            server = api.Server(host, port, {"database": database})
+            server = api.DrizzleServer(host, port, {"database": database})
             server.connect()
-        except:
+        except ConnectionError:
             server = None
             
         if server and server.is_connected:
             self.servers.append(server)
             return True
         else:
-            error = ConsoleError(_("Could not connect to")+" {0}:{1}".format(host, port))
-            self.presenter.presenter_graph.put(error)
+            self._display_error(ConsoleError(_("Could not connect to {0}:{1}").format(host, port)))
             return False
 
     def disconnect(self, host, port):
@@ -153,38 +189,40 @@
         if self.welcome_msg and self.driver.is_interactive:
             server_lines = []
             for server in self.servers:
-                line_format = "{0.hostname}:{0.port} ("+_("server")+" v{0.server_version})"
+                line_format = _("{0.hostname}:{0.port} (server v{0.server_version})")
                 server_lines.append(line_format.format(server))
             server_status = "\n".join(server_lines)
             
             welcome = self.welcome_msg.format(server_status=server_status)
             self.presenter.presenter_graph.put(welcome)
     
+    def _display_error(self, error):
+        if not isinstance(error, (BootsError, BootsWarning)):
+            error = InternalError(error)
+        self.presenter.presenter_graph.put(error)
+    
     def main(self):
         self.presenter.presenter_graph.start()
+        self.driver_stack.push_input(self.driver.driver_graph.output_link)
+        self.driver.driver_graph.start()
+        
         self._load_servers()
         self._welcome_message()
-            
-        for command, lingo in self.driver.get_input():
-            if not self.metacommands.execute(command):
-                result = self.run(command, lingo)
-            
-                if isinstance(result, node.NodeGraph):
-                    result_graph = result
-
-                else:
-                    result_graph = node.NodeGraph() 
-                    if isinstance(result, (str, Exception)) or not iterable(result):
-                        result = iter([result])
-                    result_graph.add_output(node.IteratorNode(result))
-
-                result_graph.link_output(self.presenter.presenter_graph)
-                result_graph.start()
-                result_graph.run()
-                    
+        
+        for data in self.driver_stack:
+            if isinstance(data, Exception):
+                self._display_error(data)
+            else:
+                command, lingo = data
+                try:
+                    if not self.metacommands.execute(command):
+                        self.run(command, lingo)
+                except Exception as e:
+                    self._display_error(e)
+        
         self.quit()
         
-    def quit(self, exitcode = 0):
+    def quit(self, exitcode=0):
         if self.driver.is_interactive:
             self.presenter.presenter_graph.put(_("Boots quit."))
             
@@ -204,9 +242,9 @@
                 self.presenter.present(topic.format(include_index=True))
             else:
                 paths = ", ".join("\"{0}\"".format(" ".join(path)) for path in results)
-                self.presenter.present(_("Did you mean:")+" {0}?".format(paths))
+                self.presenter.present(_("Did you mean: {0}?").format(paths))
         else:
-            self.presenter.present(_("No help found for")+" \"{0}\".".format(" ".join(query)))
+            self.presenter.present(_("No help found for \"{0}\".").format(" ".join(query)))
 
     def meta_connect(self, host=None, port=None, database=None):
         if host is None: 
@@ -229,3 +267,14 @@
             port = int(port)
 
         self.disconnect(host, port)
+
+    def meta_source(self, *file_list):
+        for filepath in file_list:
+            try:
+                script_driver = ScriptDriver(self, filepath, self.config["lingo"])
+            except IOError as e:
+                self._display_error(ConsoleError(_("Could not open file {0}").format(filepath)))
+                return
+            
+            self.driver_stack.push_input(script_driver.driver_graph.output_link)
+            script_driver.driver_graph.start()

=== modified file 'boots/lib/lingos/bash_external.py'
--- boots/lib/lingos/bash_external.py	2010-02-27 05:54:13 +0000
+++ boots/lib/lingos/bash_external.py	2010-03-07 09:23:23 +0000
@@ -25,12 +25,12 @@
 from boots.lib.lingos import external
 from boots.lib.lingos import lingo
 from boots.lib.ui.components.help import HelpTopic
-
+from boots.lib import _, n_
 
 class ExternalBashInterpreter(external.ExternalInterpreter):
     """Provides an interface to an external bash shell."""
     
-    help = HelpTopic("bash", "Bash Lingo", "External bash shell.")    
+    help = HelpTopic("bash", _("Bash Lingo"), _("External bash shell."))    
         
     def __init__(self, *args, **kwargs):
         super(ExternalBashInterpreter, self).__init__('bash', [], *args, **kwargs)

=== modified file 'boots/lib/lingos/external.py'
--- boots/lib/lingos/external.py	2010-02-27 05:40:10 +0000
+++ boots/lib/lingos/external.py	2010-03-07 09:23:23 +0000
@@ -47,12 +47,12 @@
         """Evaluate code using the external interpreter.  All return values are strings."""
         if self.interpreter == None:
             self.interpreter = subprocess.Popen(self.executable, *self.executable_args, stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
+            self.output_lines = []
+            self.lock = threading.RLock()
             # Since self.interpreter.stdout.readline could block, a thread is used to read the output.
             self.read_thread = threading.Thread(target = self._readlines)
             self.read_thread.daemon = True
             self.read_thread.start()
-            self.output_lines = []
-            self.lock = threading.RLock()
             # The maximum amount of time to wait for output.
             # FIXME: This is a kludge and should be fixed if possible.
 

=== modified file 'boots/lib/lingos/lingo.py'
--- boots/lib/lingos/lingo.py	2010-03-02 00:45:59 +0000
+++ boots/lib/lingos/lingo.py	2010-03-07 09:23:23 +0000
@@ -23,7 +23,7 @@
 
 import sys
 
-from boots.util import set_gettext
+from boots.lib import _, n_
 
 class LingoRegistry(object):
     def __init__(self):
@@ -33,7 +33,7 @@
         """Registers a lingo with the given name and interpreter.  Raises a KeyError if a lingo with
         name is already registered."""
         if name in self._lingos:
-            raise KeyError(_('A lingo with name')+' {0} '+_('already exists').format(name))
+            raise KeyError(_('A lingo with name {0} already exists').format(name))
     
         self._lingos[name] = interpreter
     
@@ -92,10 +92,10 @@
         code should be an object returned by read."""
         pass
 
-    def string(self, obj):
-        """Convert obj to a string.  obj is an object in the object system for this lingo."""
-        return str(obj)
-
+    def present(self, obj):
+        """Convert obj to a presentable object.  obj is an object in the object system for this lingo."""
+        return obj
+    
     def python(self, obj):
         """Convert obj to the appropriate python type.  obj is an object in the object system for
         this lingo."""

=== modified file 'boots/lib/lingos/lisp/builtins.py'
--- boots/lib/lingos/lisp/builtins.py	2010-03-02 00:45:59 +0000
+++ boots/lib/lingos/lisp/builtins.py	2010-03-07 09:23:23 +0000
@@ -21,10 +21,10 @@
 #
 # ##### END LICENSE BLOCK #####
 
+import sys
+
 from boots.lib.lingos.lisp import objects
-from boots.util import set_gettext
-import sys
-
+from boots.lib import _, n_
 
 nil = objects.Null()
 t = objects.T()

=== modified file 'boots/lib/lingos/lisp/lexer.py'
--- boots/lib/lingos/lisp/lexer.py	2010-03-02 00:45:59 +0000
+++ boots/lib/lingos/lisp/lexer.py	2010-03-07 09:23:23 +0000
@@ -22,7 +22,8 @@
 # ##### END LICENSE BLOCK #####
 
 import ply.lex as lex
-from boots.util import set_gettext
+
+from boots.lib import _, n_
 
 tokens = ('INTEGER', 'STRING', 'SYMBOL', 'QUOTE', 'LEFT_PAREN', 'RIGHT_PAREN')
 

=== modified file 'boots/lib/lingos/lisp/lisp.py'
--- boots/lib/lingos/lisp/lisp.py	2010-03-02 00:45:59 +0000
+++ boots/lib/lingos/lisp/lisp.py	2010-03-07 09:23:23 +0000
@@ -30,23 +30,20 @@
 # let
 # do
 
-# Optimize the code:
-# The current implementation is simple but very inefficient (especially environements, this can be fixed by using a
-# dictionary of lists instead of a list of dictionaries).
-
 import sys
 
 if __name__ == '__main__':
     sys.path.append('../../../../')
 
+import re
+import readline
+
 from boots.lib.lingos import lingo
 from boots.lib.lingos.lisp import builtins
 from boots.lib.lingos.lisp import lexer
 from boots.lib.lingos.lisp import objects
 from boots.lib.lingos.lisp import parser
-from boots.util import set_gettext
-import re
-import readline
+from boots.lib import _, n_
 
 
 def input_complete(string):
@@ -77,7 +74,7 @@
     if isinstance(stream, file):
         stream = stream.readline
     elif not callable(stream):
-        raise TypeError('{0} '+_('is not a stream or a callable').format(stream))
+        raise TypeError(_('{0} is not a stream or a callable').format(stream))
     # Read lines until all open lisp expressions have been closed.
     while True:
         line = stream()
@@ -118,7 +115,10 @@
         builtins.initialize(global_environment)
         
         while True:
-            print(evaluate(read(lambda: raw_input('> ')), global_environment))
+            try:
+                print(evaluate(read(lambda: raw_input('> ')), global_environment))
+            except SyntaxError as e:
+                print(e)
             
     except EOFError:
         pass

=== modified file 'boots/lib/lingos/lisp/objects.py'
--- boots/lib/lingos/lisp/objects.py	2010-03-02 00:45:59 +0000
+++ boots/lib/lingos/lisp/objects.py	2010-03-07 09:23:23 +0000
@@ -25,7 +25,7 @@
 import copy
 import sys
 
-from boots.util import set_gettext
+from boots.lib import _, n_
 
 _gensym_count = 1
 _symbols = {}
@@ -98,7 +98,7 @@
             else_expression = car(cdr(cdr(cdr(self))))
 
             if then_expression is Null() or cdr(cdr(cdr(cdr(self)))) is not Null():
-                raise SyntaxError(_('wrong number of arguments for if special form')+' {0}'.format(self))
+                raise SyntaxError(_('Wrong number of arguments for if special form {0}').format(self))
 
             if condition_expression.evaluate(environment) != Null():
                 return then_expression.evaluate(environment)
@@ -172,10 +172,10 @@
         try:
             return self._environment[symbol][-1]
         except KeyError:
-            raise KeyError(_('No binding for')+' {0} '+_('exists in the current environment').format(symbol))
+            raise KeyError(_('No binding for {0} exists in the current environment').format(symbol))
 
     def __setitem__(self, symbol, value):
-        """Sets symbol to value in the environment.  If no binding for symbol exists, a binding is created at the innermost
+        """Sets symbol to value in the environment. If no binding for symbol exists, a binding is created at the innermost
         scope."""
         if not isinstance(symbol, Symbol):
             raise TypeError(_('Expected a symbol'))
@@ -204,7 +204,7 @@
     #     return False
 
     def push(self, symbol_values):
-        """Adds a new innermost lexical scope as determined by symbol_values.  symbol_values is a dictionary mapping Symbols
+        """Adds a new innermost lexical scope as determined by symbol_values. symbol_values is a dictionary mapping Symbols
         to Objects and describes bindings in the current scope."""
         self._scopes.append(set(symbol_values.keys()))
 

=== modified file 'boots/lib/lingos/lisp/parser.py'
--- boots/lib/lingos/lisp/parser.py	2010-03-02 00:45:59 +0000
+++ boots/lib/lingos/lisp/parser.py	2010-03-07 09:23:23 +0000
@@ -22,10 +22,11 @@
 # ##### END LICENSE BLOCK #####
 
 from lexer import tokens
+import ply.yacc as yacc
+
 from boots.lib.lingos.lisp import builtins
 from boots.lib.lingos.lisp import objects
-from boots.util import set_gettext
-import ply.yacc as yacc
+from boots.lib import _, n_
 
 
 def p_expression_integer(p):
@@ -61,7 +62,7 @@
     p[0] = objects.Cons(p[1], p[2])
 
 def p_error(p):
-    print(_('syntax error'))
+    raise SyntaxError(_('syntax error'))
 
 # Disable debugging output and caching of parse tables.
 parser = yacc.yacc(debug = 0, write_tables = 0)

=== modified file 'boots/lib/lingos/piped_sql.py'
--- boots/lib/lingos/piped_sql.py	2010-03-02 00:45:59 +0000
+++ boots/lib/lingos/piped_sql.py	2010-03-07 09:23:23 +0000
@@ -21,14 +21,14 @@
 #
 # ##### END LICENSE BLOCK #####
 
+import re
+
 from boots.api.nodes.node import NodeGraph, SyncNode, IteratorNode
-from boots.api.constructors import construct, csv_output_file_node
+from boots.api.constructors import construct, csv_output_file_node, sink_node
 from boots.lib.ui.components.help import HelpTopic
 from boots.lib.lingos import lingo
 from boots.lib.lingos import sql
-from boots.util import set_gettext
-import re
-
+from boots.lib import _, n_
 
 # Set this to another node constructor to change the default constructor used for output files.
 output_file_node = csv_output_file_node
@@ -40,9 +40,11 @@
 # This regexp matches a function call syntax.  Use the name group to access the name of the function
 # and the arguments group to access the list of arguments (as a string).
 constructor_call_re = re.compile('^(?P<name>[a-zA-Z_]+)\((?P<arguments>([^,\(\)]+,)*[^,\(\)]+)?\)$')
+# Matches a string of the form 'abc' or "abc".
+string_re = re.compile('^(?P<text>(\'[^\']*\')|("[^"]*"))')
 
 class PipedSQLInterpreter(sql.SQLInterpreter):
-    help = HelpTopic("pipedsql", "Piped SQL Lingo", _("Enhanced SQL query language supporting pipes."))
+    help = HelpTopic("pipedsql", _("Piped SQL Lingo"), _("Enhanced SQL query language supporting pipes."))
     
     def __init__(self, *args, **kwargs):
         super(PipedSQLInterpreter, self).__init__(*args, **kwargs)
@@ -54,7 +56,7 @@
         match = clause_re.match(clause_string)
 
         if not match:
-            raise SyntaxError('{0} '+_('is not in the correct function call syntax').format(clause_string))
+            raise SyntaxError(_('{0} is not in the correct function call syntax').format(clause_string))
 
         constructor_call = match.group('constructor_call').strip()
         output_file = match.group('output_file')
@@ -65,13 +67,13 @@
         match = constructor_call_re.match(constructor_string)
 
         if not match:
-            raise SyntaxError('{0} '+_('is not in the correct function call syntax').format(constructor_string))
+            raise SyntaxError(_('{0} is not in the correct function call syntax').format(constructor_string))
         
         name = match.group('name')
         arguments = match.group('arguments')
 
         if arguments:
-            arguments = [argument.strip('\'"') for argument in arguments.split(',')]
+            arguments = [string_re.match(argument.strip()).group('text')[1:-1] for argument in arguments.split(',')]
         else:
             arguments = []
         
@@ -137,6 +139,13 @@
                 last_node = node
                 first_node = False
 
+            # Suppress output from the pipeline if the last clause redirected output.
+            if output_file:
+                sink = sink_node()
+                nodes.add(sink)
+                node.connect_output(sink)
+                node = sink
+                
             nodes.add_output(node)
             return nodes
 

=== modified file 'boots/lib/lingos/python.py'
--- boots/lib/lingos/python.py	2010-02-27 05:54:13 +0000
+++ boots/lib/lingos/python.py	2010-03-07 09:23:23 +0000
@@ -27,12 +27,13 @@
 from boots.api import errors
 from boots.lib.lingos import lingo
 from boots.lib.ui.components.help import HelpTopic
+from boots.lib import _, n_
 
 class PythonInterpreter(lingo.Interpreter):
     """Implements a python interpreter that will send commands to the python interpreter that runs
     boots."""
     
-    help = HelpTopic("python", "Python Lingo", "Integrated Python interpreter using the Boots API.")    
+    help = HelpTopic("python", _("Python Lingo"), _("Integrated Python interpreter using the Boots API."))    
     
     def __init__(self, *args, **kwargs):
         super(PythonInterpreter, self).__init__(*args, **kwargs)
@@ -56,13 +57,18 @@
     def evaluate(self, code):
         if code.strip():
             try:
-                # Wrap each python object in a list so that the Console will not iterate over it if it is an iterable.
                 return eval(code, self._globals, self._locals)
             # If eval results in an error, it might be because code is a statement rather than an expression.
             except:
                 try:
                     exec code in self._globals, self._locals
                 except Exception:
-                    return errors.ConsoleError(traceback.format_exc())
+                    return errors.BootsError(traceback.format_exc())
+                
+    def present(self, obj):
+        if not isinstance(obj, Exception) and obj is not None:
+            return repr(obj)
+        else:
+            return obj
                     
 lingo.register('python', PythonInterpreter)

=== modified file 'boots/lib/lingos/sql.py'
--- boots/lib/lingos/sql.py	2010-02-27 05:54:13 +0000
+++ boots/lib/lingos/sql.py	2010-03-07 09:23:23 +0000
@@ -24,9 +24,10 @@
 from boots.api.nodes.node import NodeGraph, SyncNode, IteratorNode
 from boots.lib.ui.components.help import HelpTopic
 from boots.lib.lingos import lingo
+from boots.lib import _, n_
 
 class SQLInterpreter(lingo.Interpreter):
-    help = HelpTopic("sql", "SQL Lingo", "Raw SQL commands sent to a server.")
+    help = HelpTopic("sql", _("SQL Lingo"), _("Raw SQL commands sent to a server."))
     
     def __init__(self, *args, **kwargs):
         super(SQLInterpreter, self).__init__(*args, **kwargs)

=== modified file 'boots/lib/ui/components/help.py'
--- boots/lib/ui/components/help.py	2010-03-02 00:45:59 +0000
+++ boots/lib/ui/components/help.py	2010-03-07 09:23:23 +0000
@@ -21,7 +21,7 @@
 #
 # ##### END LICENSE BLOCK #####
 
-from boots.util import set_gettext
+from boots.lib import _, n_
 
 def issubseq(subseq, seq):
     """Determines if the elements the sequence subseq form a subsequence of the sequence seq."""
@@ -65,7 +65,7 @@
         template += "{0.description}"
         
         if self.see_also:
-            template += "\n\n"+_("See also:")+" {0.see_also}"
+            template += "\n\n"+_("See also: {0.see_also}")
         
         output = template.format(self)
         if include_index and self._subtopics:
@@ -103,7 +103,7 @@
                 assert isinstance(item, str)
             return query
         else:
-            raise TypeError(_('query object')+' {0} '+_('is not a string or tuple of strings').format(query))
+            raise TypeError(_('query object {0} is not a string or tuple of strings').format(query))
  
     def _ensure_key(self, key):
         """Creates a new subtopic that key maps to if none exists."""

=== modified file 'boots/lib/ui/components/metacommands.py'
--- boots/lib/ui/components/metacommands.py	2010-03-02 00:45:59 +0000
+++ boots/lib/ui/components/metacommands.py	2010-03-07 09:23:23 +0000
@@ -22,7 +22,32 @@
 # ##### END LICENSE BLOCK #####
 
 import warnings
-from boots.util import set_gettext
+import inspect
+import types
+
+from boots.api.errors import BootsError, BootsWarning
+from boots.lib import _, n_
+
+class MetaCommandError(BootsError):
+    """Errors related to metacommands."""
+    
+class MetaCommandConflictWarning(BootsWarning):
+    """Raised when conflicting metacommand definitions are encountered."""
+    pass
+    
+class InvalidArgumentError(MetaCommandError):
+    """Raised when a metacommand has an invalid argument."""
+
+def argument_count(func):
+    # Note: this can be fooled by things like *args
+    argspec = inspect.getargspec(func)
+    if argspec.varargs is not None:
+        return None
+    else:
+        argcount = len(argspec.args)
+        if type(func) is types.MethodType and func.im_self is not None:
+            argcount -= 1        
+        return argcount
 
 def parse_metacommand(commandstring):
     """This function wraps str.split() for metacommands
@@ -31,8 +56,8 @@
     to return a list of substrings, using whitespace as separator. The metacommand
     object uses this list to call a metacommand function and pass parameters.
     
-    """ 
-    return commandstring.split()    
+    """
+    return commandstring.rstrip(";\n").split()    
 
 class MetaCommandManager(object):
     def __init__(self):
@@ -44,7 +69,7 @@
             # FIXME: Issue warning through the UI using ui.print
             # FIXME: Determine the offending command(s) (set.intersect?)
             # FIXME: Print offending commands
-            warnings.warn(_("Conflicts between metacommands detected."))
+            return MetaCommandConflictWarning(_("Conflicts between metacommands detected."))
         self.names |= newnames
 
 class MetaCommands(object):
@@ -66,7 +91,7 @@
     def get_metacommand(self, command):
         commandlist = parse_metacommand(command)
         if len(commandlist) != 0 and commandlist[0] in self.commands:
-            return self.commands[commandlist[0]], commandlist[1:]
+            return commandlist[0], self.commands[commandlist[0]], commandlist[1:]
 
     def execute(self, command):
         """Parse and execute a metacommand string.
@@ -78,8 +103,14 @@
         """
         metacommand = self.get_metacommand(command)
         if metacommand:
-            metacommand[0](*metacommand[1])
-            # FIXME: Do we need to pass metacommand return values back?
-            return True
+            name, func, args = metacommand
+            expected_arg_count = argument_count(func)
+            if expected_arg_count is not None and len(args) != expected_arg_count:
+                raise InvalidArgumentError(_("{0} takes {1} arguments ({2} given)").format(
+                                            name, expected_arg_count, len(args)))
+            else:
+                func(*args)
+                # FIXME: Do we need to pass metacommand return values back?
+                return True
         else:
             return False

=== modified file 'boots/lib/ui/generic.py'
--- boots/lib/ui/generic.py	2010-02-27 05:40:10 +0000
+++ boots/lib/ui/generic.py	2010-03-07 09:23:23 +0000
@@ -28,6 +28,8 @@
 import os
 import StringIO
 
+from boots.api.nodes.node import NodeGraph, SyncNode
+
 class StreamDriver(object):
     """StreamDrivers receive stream inputs to boots, stdin for example."""
     def __init__(self, console, stream, lingo):
@@ -36,6 +38,8 @@
         self.console = console
         self.stream = stream
         self.lingo = lingo
+        self.driver_graph = NodeGraph("streamdriver")
+        self.driver_graph.add(SyncNode(self.get_input()), output=True)
 
     def get_input(self):
         """Gets user input from a stream."""
@@ -64,6 +68,8 @@
     def __init__(self, stream):
         """Initialize a StreamPresenter giving it the stream to write to."""
         self.stream = stream
+        self.presenter_graph = NodeGraph("streampresenter")
+        self.presenter_graph.add(SyncNode(self.present), input=True, output=True)
         
     def present(self, row):
         """Prints row information in a "raw" format"""

=== modified file 'boots/lib/ui/plain.py'
--- boots/lib/ui/plain.py	2010-03-02 00:45:59 +0000
+++ boots/lib/ui/plain.py	2010-03-07 09:23:23 +0000
@@ -28,13 +28,15 @@
 import os
 import time
 import readline
+import subprocess
+import threading
 
- 
-from boots.api.nodes.node import NodeGraph, SyncNode
+from boots.api.api import Rows, ResultInfo
+from boots.api.nodes.node import Status, NodeGraph, SyncNode, filter_none
 from boots.lib.ui.components.help import HelpTopic
-from boots.lib.ui.components.metacommands import MetaCommands, parse_metacommand
+from boots.lib.ui.components.metacommands import MetaCommandError, MetaCommands, parse_metacommand
 from boots.lib.ui.generic import StdinDriver, StdoutPresenter
-from boots.util import set_gettext
+from boots.lib import _, n_
 
 class PlainUI(StdinDriver, StdoutPresenter):
     """Class that provides a 'plain' UI for boots. Input is taken on stdin,
@@ -42,11 +44,11 @@
     results are printed to stdout. These results are printed as tables when
     they are Server packets and as string interpretations otherwise."""
     
-    help = HelpTopic("plain", "Plain UI", _("Plain UI documentation."), _("""
-        A simple, minimal user interface for Boots."""))
+    help = HelpTopic("plain", _("Plain UI"), _("Plain UI documentation."),
+        _("A simple, minimal user interface for Boots."))
     
     help.add("commands", None, _("List of Plain UI commands."))
-    help["commands"].add("\use", "use", _("Switch to a different lingo."))
+    help["commands"].add("\use", _("use"), _("Switch to a different lingo."))
     
     def __init__(self, console):
         """Initialize a UI giving it its parent console, primary prompt,
@@ -61,16 +63,15 @@
         self.prompt2 = console.config["prompt2"]
         self.hist_file = console.config["history_file"]
         self.lingo = console.config["lingo"]
+        self.pager_command = console.config["pager_command"]
         self.last_desc = None
         self.buffer = []
         
         self.driver_graph = NodeGraph("plaindriver")
-        self.driver_graph.add_output(SyncNode(self.get_input))
+        self.driver_graph.add(SyncNode(self.get_input()), output=True)
         
         self.presenter_graph = NodeGraph("plainpresenter")
-        present_node = SyncNode(self.present)
-        self.presenter_graph.add_input(present_node)
-        self.presenter_graph.add_output(present_node)
+        self.presenter_graph.add(SyncNode(self.present, filter=filter_none), input=True, output=True)
         
         readline.set_history_length(console.config["history_length"])
         self.read_history()
@@ -112,6 +113,8 @@
                 
             except EOFError:
                 return
+            except MetaCommandError as e:
+                yield e
             
     def set_prompt(self, prompt1 = None, prompt2 = None):
         """Change the prompts during execution of a PlainUI."""
@@ -125,6 +128,25 @@
             self.prompt1 = prompt1
             self.prompt2 = prompt2
 
+    def print_with_pager(self, text):
+        try:
+            pager = subprocess.Popen(self.pager_command.split(),
+                                     shell=False,
+                                     stdin=subprocess.PIPE)
+        except:
+            sys.stdout.write(_("Unable to run pager command \"{0}\". Pager disabled.\n")
+                             .format(self.pager_command))
+            self.pager_command = None
+            return False
+            
+        try:
+            pager.communicate(text)
+        except IOError:
+            # IOError is raised sometimes with large outputs
+            pass
+        
+        return True
+
     def present(self, result):
         """Print the result provided as an argument.
 
@@ -135,42 +157,77 @@
         def padded(fields, widths):
             """Utility function used to convert rows from tuples to table rows.
             Results are returned as strings."""
-            return "| {0} |\n".format(" | ".join(map(str.ljust, fields, widths)))
+            return "| {0} |".format(" | ".join(map(str.ljust, fields, widths)))
         
         def show_NULL(value):
             """There is a 'bug' in the dbapi that does not convert NULL objects
             to the string 'NULL'. This utility function performs that
             conversion."""
             return value if value is not None else "NULL"
-        
-        if type(result) is dict and "__server_execute_sql_query" in result:
-            self.last_desc = result["info"]
-            if result["result"]:
-                self.buffer.extend(result["result"])
-            else:
-                if self.buffer:
-                    max_widths = map(max, [(len(column[0]), column[2]) for column in self.last_desc])
-                    dashes = map(lambda x: "-"*(x+2), max_widths)
-                    sep_line = "+" + "+".join(dashes) + "+\n"
-                    current_time = time.time()
-                    info_line = "{0} "+_("rows in set")+" ({1:.2f} "+_("seconds")+").\n".format(len(self.buffer),
-                                                                             current_time - result["begin_time"])
-                    names = (column[0] for column in self.last_desc)
-                    sys.stdout.write(sep_line)
-                    sys.stdout.write(padded(names, max_widths))
-                    sys.stdout.write(sep_line)
-                    for row in self.buffer:
-                        sys.stdout.write(padded(map(show_NULL, row), max_widths))
-                    sys.stdout.write(sep_line)
-                    sys.stdout.write(info_line)
-                    # Reset values for next result set.
-                    self.buffer = []
-        else:
-            if isinstance(result, Exception):
-                sys.stdout.write(_("ERROR "))
-                sys.stdout.write(" :: ".join(map(str, result.args)))
-            else:
-                sys.stdout.write(str(result))
+
+        def _gen_table(info):
+            if self.buffer:
+                max_widths = map(max, [(len(column[0]), column[2]) for column in info["description"]])
+                dashes = map(lambda x: "-"*(x+2), max_widths)
+                sep_line = "+" + "+".join(dashes) + "+"
+                names = (column[0] for column in info["description"])
+                yield sep_line
+                yield padded(names, max_widths)
+                yield sep_line
+                for row in self.buffer:
+                    yield padded(map(show_NULL, row), max_widths)
+    
+                yield sep_line
+            
+            if self.console.driver.is_interactive:
+                elapsed = info["end_time"] - info["begin_time"]
+                noun = "row" if info["row_count"] == 1 else "rows"
+                if info["description"] is not None:
+                    info_line = n_("{count} row in set ({elapsed:.2f} seconds)", 
+                                   "{count} rows in set ({elapsed:.2f} seconds)",
+                                   info["row_count"])
+                else:
+                    info_line = n_("{count} row affected ({elapsed:.2f} seconds)",
+                                   "{count} rows affected ({elapsed:.2f} seconds)",
+                                   info["row_count"])
+                    
+                yield info_line.format(count=info["row_count"],
+                                       noun=noun,
+                                       elapsed=elapsed)
+
+        if type(result) is Rows:
+            self.buffer.extend(result)
+        elif isinstance(result, ResultInfo):
+            printed = False
+            output = _gen_table(result.value)
+            if self.pager_command and self.console.driver.is_interactive:
+                printed = self.print_with_pager("\n".join(output))
+            
+            # Fallback if no pager set, or paging fails.
+            if not printed:
+                for line in output:
+                    sys.stdout.write(line)
+                    sys.stdout.write("\n")
+                
+            # Reset values for next result set.
+            self.buffer = []
+        elif isinstance(result, Status):
+            sys.stdout.write(_("Status"))
+            sys.stdout.write(" :: ")
+            sys.stdout.write(str(result))
+            sys.stdout.write("\n")
+        elif isinstance(result, Warning):
+            sys.stderr.write(_("WARNING"))
+            sys.stderr.write(" :: ")
+            sys.stderr.write(str(result))
+            sys.stderr.write("\n")
+        elif isinstance(result, Exception):
+            sys.stderr.write(_("ERROR"))
+            sys.stderr.write(" :: ")
+            sys.stderr.write(str(result))
+            sys.stderr.write("\n")
+        elif result is not None:
+            sys.stdout.write(str(result))
             sys.stdout.write("\n")
 
     @property
@@ -186,4 +243,4 @@
         if lingo in self.console.lingos:
             self.lingo = lingo
         else:
-            self.present(_("The specified lingo")+" \"{0}\" "+_("does not exist.").format(lingo))
+            self.present(_("The specified lingo \"{0}\" does not exist.").format(lingo))

=== removed file 'boots/util.py'
--- boots/util.py	2010-03-02 01:04:23 +0000
+++ boots/util.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Boots Client Project
-# www.launchpad.net/boots
-#
-# ##### BEGIN LICENSE BLOCK #####
-#
-# Copyright (C) 2009-2010 Clark Boylan, Ken Brotherton, Max Goodman,
-#                         Victoria Lewis, David Rosenbaum, and Andreas Turriff
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# ##### END LICENSE BLOCK #####
-
-import locale, gettext
-def set_gettext(mo_location='/usr/share/locale'):
-    locale.setlocale(locale.LC_ALL)
-    gettext.install('boots', mo_location)

=== removed file 'localizations/potfiles.txt'
--- localizations/potfiles.txt	2010-03-02 01:04:23 +0000
+++ localizations/potfiles.txt	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-../boots/lib/console.py
-../boots/lib/ui/plain.py
-../boots/lib/ui/components/metacommands.py
-../boots/lib/ui/components/help.py
-../boots/lib/lingos/lingo.py
-../boots/lib/lingos/piped_sql.py
-../boots/lib/lingos/lisp/builtins.py
-../boots/lib/lingos/lisp/lexer.py
-../boots/lib/lingos/lisp/lisp.py
-../boots/lib/lingos/lisp/objects.py
-../boots/lib/lingos/lisp/parser.py
-../boots/app/client_config.py

=== renamed directory 'localizations' => 'po'
=== modified file 'po/README.txt'
--- localizations/README.txt	2010-03-02 01:04:23 +0000
+++ po/README.txt	2010-03-07 09:23:23 +0000
@@ -1,22 +1,16 @@
-========When adding code that outputs a string========
-1) Add (if not present already) to the import section of the .py file
-#=========
-import gettext
-gettext.bindtextdomain("fslint", "/usr/share/locale") #sys default used if localedir=None
-gettext.textdomain("fslint")
-_ = gettext.gettext
-#=========
-And then wrap all output strings with _("...").
-You should do this so that if you are using dynamicly created content, that created content is not part of the wrapped string.
-Ex:
+====== When adding code that outputs a string ======
+1) Add (if not present already) to the import section of the .py file:
+
+Depending on the package the file is in:
+from boots.app import _, n_
+from boots.api import _, n_
+from boots.lib import _, n_
+
+Then, wrap all output strings with _("...").
+
+Example:
 help = "Execute commands from file and exit")
 should be wrapped as such:
 help = _("Execute commands from file and exit"))
-Ex:
-print("rcfile {0} contains a syntax error".format(filepath))
-should be wrapped as such:
-print(_("rcfile ")+"{0} "+_("contains a syntax error").format(filepath))
 
-2) Add your file path to the /boots/localizations/potfiles.txt file.
-3) Generate the updated .pot file by running the /boots/localization/createpots.sh script.  This will overwrite the existing pot.cms file.  Any prevously generated .po .mo files can then be updated from this new file.
-4) Upload new pot file to the launchpad localization section for creation or updating of .po files.  (more on this later --ken)
+2) Generate the updated .pot file by running the /boots/po/createpots.sh script.  This will overwrite the existing pot.cms file. Any prevously generated .po .mo files can then be updated from this new file.
\ No newline at end of file

=== modified file 'po/boots.pot'
--- localizations/boots.pot	2010-03-02 01:04:23 +0000
+++ po/boots.pot	2010-03-07 09:23:23 +0000
@@ -6,160 +6,115 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 16:40-0800\n"
+"Project-Id-Version: boots\n"
+"Report-Msgid-Bugs-To: http://translations.launchpad.net/boots\n"
+"POT-Creation-Date: 2010-03-07 01:23-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../boots/lib/console.py:96
-msgid ""
-"\n"
-"            Boots is a flexible, extensible, and multilingual shell for "
-"working with databases. To read more about a subtopic, use `help <topic>`."
-msgstr ""
-
-#: ../boots/lib/console.py:100
-msgid "List of Boots commands."
-msgstr ""
-
-#: ../boots/lib/console.py:103
-msgid "Quit boots."
-msgstr ""
-
-#: ../boots/lib/console.py:104
-msgid "Show help for a topic."
-msgstr ""
-
-#: ../boots/lib/console.py:104
-msgid ""
-"\n"
-"            help <topic>\n"
-"            Show help for \"topic\"."
-msgstr ""
-
-#: ../boots/lib/console.py:108
-msgid "Documentation for loaded lingos."
-msgstr ""
-
-#: ../boots/lib/console.py:108
-msgid ""
-"\n"
-"            A lingo is a command language usable within Boots."
-msgstr ""
-
-#: ../boots/lib/console.py:123
-msgid "Invalid lingo"
-msgstr ""
-
-#: ../boots/lib/console.py:123
-msgid "specified."
-msgstr ""
-
-#: ../boots/lib/console.py:136
-msgid "Could not connect to"
-msgstr ""
-
-#: ../boots/lib/console.py:156
-msgid "server"
-msgstr ""
-
-#: ../boots/lib/console.py:189
-msgid "Boots quit."
-msgstr ""
-
-#: ../boots/lib/console.py:207
-msgid "Did you mean:"
-msgstr ""
-
-#: ../boots/lib/console.py:209
-msgid "No help found for"
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:45
-msgid "Plain UI documentation."
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:45
-msgid ""
-"\n"
-"        A simple, minimal user interface for Boots."
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:48
-msgid "List of Plain UI commands."
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:49
-msgid "Switch to a different lingo."
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:156
-msgid "rows in set"
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:156
-msgid "seconds"
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:170
-msgid "ERROR "
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:189
-msgid "The specified lingo"
-msgstr ""
-
-#: ../boots/lib/ui/plain.py:189
-msgid "does not exist."
-msgstr ""
-
-#: ../boots/lib/ui/components/metacommands.py:47
-msgid "Conflicts between metacommands detected."
-msgstr ""
-
-#: ../boots/lib/ui/components/help.py:68
-msgid "See also:"
-msgstr ""
-
-#: ../boots/lib/ui/components/help.py:72
-msgid "Subtopics"
-msgstr ""
-
-#: ../boots/lib/ui/components/help.py:106
-msgid "query object"
-msgstr ""
-
-#: ../boots/lib/ui/components/help.py:106
-msgid "is not a string or tuple of strings"
-msgstr ""
-
-#: ../boots/lib/lingos/lingo.py:36
-msgid "A lingo with name"
-msgstr ""
-
-#: ../boots/lib/lingos/lingo.py:36
-msgid "already exists"
-msgstr ""
-
-#: ../boots/lib/lingos/piped_sql.py:45
-msgid "Enhanced SQL query language supporting pipes."
-msgstr ""
-
-#: ../boots/lib/lingos/piped_sql.py:57 ../boots/lib/lingos/piped_sql.py:68
-msgid "is not in the correct function call syntax"
-msgstr ""
-
-#: ../boots/lib/lingos/piped_sql.py:95
-msgid "error1"
-msgstr ""
-
-#: ../boots/lib/lingos/piped_sql.py:107
-msgid "SQL is only permitted for the first clause"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../boots/api/api.py:89
+msgid "Could not connect to {0}"
+msgstr ""
+
+#: ../boots/api/api.py:101
+msgid "Connection closed"
+msgstr ""
+
+#: ../boots/api/api.py:124
+msgid "Lost connection to {0}. Reconnecting..."
+msgstr ""
+
+#: ../boots/api/api.py:136
+msgid "Reconnected."
+msgstr ""
+
+#: ../boots/api/constructors.py:36
+msgid "A constructor with name {0} already exists"
+msgstr ""
+
+#: ../boots/api/constructors.py:47
+msgid "There is no constructor with the name {0}."
+msgstr ""
+
+#: ../boots/api/errors.py:53
+msgid "Lost connection to {0}"
+msgstr ""
+
+#: ../boots/api/errors.py:58
+msgid "(Exception upon reconnect: {0})"
+msgstr ""
+
+#: ../boots/app/client_config.py:93
+msgid "Execute command and exit"
+msgstr ""
+
+#: ../boots/app/client_config.py:98
+msgid "Use database"
+msgstr ""
+
+#: ../boots/app/client_config.py:103
+msgid "Execute commands from file and exit"
+msgstr ""
+
+#: ../boots/app/client_config.py:108
+msgid "Set the lingo to use"
+msgstr ""
+
+#: ../boots/app/client_config.py:112
+msgid "Do not read user configuration file"
+msgstr ""
+
+#: ../boots/app/client_config.py:117
+msgid "Filename of user configuration file"
+msgstr ""
+
+#: ../boots/app/client_config.py:122
+msgid "Connect to host"
+msgstr ""
+
+#: ../boots/app/client_config.py:127
+msgid "Use port number"
+msgstr ""
+
+#: ../boots/app/client_config.py:132
+msgid "Login with username"
+msgstr ""
+
+#: ../boots/app/client_config.py:137
+msgid "Connect using password. If none is given, query for password"
+msgstr ""
+
+#: ../boots/app/client_config.py:142
+msgid "Pipe query results to the specified pager."
+msgstr ""
+
+#: ../boots/app/client_config.py:147
+msgid "Specify the SQL statement terminating character. Default is ';'."
+msgstr ""
+
+#: ../boots/app/client_config.py:152
+msgid "Specify file to save history to"
+msgstr ""
+
+#: ../boots/app/client_config.py:157
+msgid "Specify max history file length"
+msgstr ""
+
+#: ../boots/app/client_config.py:205
+msgid "rcfile {0} not found"
+msgstr ""
+
+#: ../boots/app/client_config.py:207
+msgid "rcfile {0} contains a syntax error"
+msgstr ""
+
+#: ../boots/app/client_config.py:209
+msgid "rcfile {0} contains an error: {1}"
 msgstr ""
 
 #: ../boots/lib/lingos/lisp/builtins.py:62
@@ -170,20 +125,20 @@
 msgid "Expected a cons or string"
 msgstr ""
 
-#: ../boots/lib/lingos/lisp/lexer.py:38
+#: ../boots/lib/lingos/lisp/lexer.py:39
 msgid "illegal character {0} found"
 msgstr ""
 
-#: ../boots/lib/lingos/lisp/lisp.py:61
+#: ../boots/lib/lingos/lisp/lisp.py:58
 msgid "unmatched closing \")\""
 msgstr ""
 
-#: ../boots/lib/lingos/lisp/lisp.py:80
-msgid "is not a stream or a callable"
+#: ../boots/lib/lingos/lisp/lisp.py:77
+msgid "{0} is not a stream or a callable"
 msgstr ""
 
 #: ../boots/lib/lingos/lisp/objects.py:101
-msgid "wrong number of arguments for if special form"
+msgid "Wrong number of arguments for if special form {0}"
 msgstr ""
 
 #: ../boots/lib/lingos/lisp/objects.py:120
@@ -201,81 +156,221 @@
 msgstr ""
 
 #: ../boots/lib/lingos/lisp/objects.py:175
-msgid "No binding for"
-msgstr ""
-
-#: ../boots/lib/lingos/lisp/objects.py:175
-msgid "exists in the current environment"
+msgid "No binding for {0} exists in the current environment"
 msgstr ""
 
 #: ../boots/lib/lingos/lisp/objects.py:220
 msgid "Cannot pop the innermost scope because then no scopes would remain"
 msgstr ""
 
-#: ../boots/lib/lingos/lisp/parser.py:64
+#: ../boots/lib/lingos/lisp/parser.py:65
 msgid "syntax error"
 msgstr ""
 
-#: ../boots/app/client_config.py:68
-msgid "Execute command and exit"
-msgstr ""
-
-#: ../boots/app/client_config.py:73
-msgid "Use database"
-msgstr ""
-
-#: ../boots/app/client_config.py:78
-msgid "Execute commands from file and exit"
-msgstr ""
-
-#: ../boots/app/client_config.py:83
-msgid "Set the lingo to use"
-msgstr ""
-
-#: ../boots/app/client_config.py:87
-msgid "Do not read user configuration file"
-msgstr ""
-
-#: ../boots/app/client_config.py:92
-msgid "Filename of user configuration file"
-msgstr ""
-
-#: ../boots/app/client_config.py:97
-msgid "Connect to host"
-msgstr ""
-
-#: ../boots/app/client_config.py:102
-msgid "Use port number"
-msgstr ""
-
-#: ../boots/app/client_config.py:107
-msgid "Login with username"
-msgstr ""
-
-#: ../boots/app/client_config.py:112
-msgid "Connect using password. If none is given, query for password"
-msgstr ""
-
-#: ../boots/app/client_config.py:117
-msgid "Specify the SQL statement terminating character. Default is ';'."
-msgstr ""
-
-#: ../boots/app/client_config.py:122
-msgid "Specify file to save history to"
-msgstr ""
-
-#: ../boots/app/client_config.py:127
-msgid "Specify max history file length"
-msgstr ""
-
-#: ../boots/app/client_config.py:167
-msgid "not found"
-msgstr ""
-
-#: ../boots/app/client_config.py:169
-msgid "contains a syntax error"
-msgstr ""
-
-#: ../boots/app/client_config.py:171
-msgid "contains an error:"
+#: ../boots/lib/lingos/bash_external.py:33
+msgid "Bash Lingo"
+msgstr ""
+
+#: ../boots/lib/lingos/bash_external.py:33
+msgid "External bash shell."
+msgstr ""
+
+#: ../boots/lib/lingos/lingo.py:36
+msgid "A lingo with name {0} already exists"
+msgstr ""
+
+#: ../boots/lib/lingos/sql.py:30
+msgid "SQL Lingo"
+msgstr ""
+
+#: ../boots/lib/lingos/sql.py:30
+msgid "Raw SQL commands sent to a server."
+msgstr ""
+
+#: ../boots/lib/lingos/python.py:36
+msgid "Python Lingo"
+msgstr ""
+
+#: ../boots/lib/lingos/python.py:36
+msgid "Integrated Python interpreter using the Boots API."
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:47
+msgid "Piped SQL Lingo"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:47
+msgid "Enhanced SQL query language supporting pipes."
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:59 ../boots/lib/lingos/piped_sql.py:70
+msgid "{0} is not in the correct function call syntax"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:97
+msgid "error1"
+msgstr ""
+
+#: ../boots/lib/lingos/piped_sql.py:109
+msgid "SQL is only permitted for the first clause"
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:68
+msgid "See also: {0.see_also}"
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:72
+msgid "Subtopics"
+msgstr ""
+
+#: ../boots/lib/ui/components/help.py:106
+msgid "query object {0} is not a string or tuple of strings"
+msgstr ""
+
+#: ../boots/lib/ui/components/metacommands.py:72
+msgid "Conflicts between metacommands detected."
+msgstr ""
+
+#: ../boots/lib/ui/components/metacommands.py:109
+msgid "{0} takes {1} arguments ({2} given)"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:47
+msgid "Plain UI"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:47
+msgid "Plain UI documentation."
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:48
+msgid "A simple, minimal user interface for Boots."
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:50
+msgid "List of Plain UI commands."
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:51
+msgid "use"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:51
+msgid "Switch to a different lingo."
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:137
+msgid "Unable to run pager command \"{0}\". Pager disabled.\n"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:186
+msgid "{count} row in set ({elapsed:.2f} seconds)"
+msgid_plural "{count} rows in set ({elapsed:.2f} seconds)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../boots/lib/ui/plain.py:190
+msgid "{count} row affected ({elapsed:.2f} seconds)"
+msgid_plural "{count} rows affected ({elapsed:.2f} seconds)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../boots/lib/ui/plain.py:215
+msgid "Status"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:220
+msgid "WARNING"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:225
+msgid "ERROR"
+msgstr ""
+
+#: ../boots/lib/ui/plain.py:246
+msgid "The specified lingo \"{0}\" does not exist."
+msgstr ""
+
+#: ../boots/lib/console.py:69
+msgid "Boots encountered an internal error: {0}"
+msgstr ""
+
+#: ../boots/lib/console.py:119
+msgid "Boots Help"
+msgstr ""
+
+#: ../boots/lib/console.py:119
+msgid "Help"
+msgstr ""
+
+#: ../boots/lib/console.py:120
+msgid ""
+"Boots is a flexible, extensible, and multilingual shell for working with "
+"databases. To read more about a subtopic, use `help <topic>`."
+msgstr ""
+
+#: ../boots/lib/console.py:123
+msgid "List of Boots commands."
+msgstr ""
+
+#: ../boots/lib/console.py:126
+msgid "quit"
+msgstr ""
+
+#: ../boots/lib/console.py:126
+msgid "Quit boots."
+msgstr ""
+
+#: ../boots/lib/console.py:127
+msgid "help"
+msgstr ""
+
+#: ../boots/lib/console.py:127
+msgid "Show help for a topic."
+msgstr ""
+
+#: ../boots/lib/console.py:128
+msgid ""
+"help <topic>\n"
+"Show help for \"topic\"."
+msgstr ""
+
+#: ../boots/lib/console.py:131
+msgid "Lingos"
+msgstr ""
+
+#: ../boots/lib/console.py:131
+msgid "Documentation for loaded lingos."
+msgstr ""
+
+#: ../boots/lib/console.py:132
+msgid "A lingo is a command language usable within Boots."
+msgstr ""
+
+#: ../boots/lib/console.py:144
+msgid "Invalid lingo \"{0}\" specified."
+msgstr ""
+
+#: ../boots/lib/console.py:173
+msgid "Could not connect to {0}:{1}"
+msgstr ""
+
+#: ../boots/lib/console.py:192
+msgid "{0.hostname}:{0.port} (server v{0.server_version})"
+msgstr ""
+
+#: ../boots/lib/console.py:227
+msgid "Boots quit."
+msgstr ""
+
+#: ../boots/lib/console.py:245
+msgid "Did you mean: {0}?"
+msgstr ""
+
+#: ../boots/lib/console.py:247
+msgid "No help found for \"{0}\"."
+msgstr ""
+
+#: ../boots/lib/console.py:276
+msgid "Could not open file {0}"
 msgstr ""

=== modified file 'po/createpots.sh'
--- localizations/createpots.sh	2010-03-02 01:04:23 +0000
+++ po/createpots.sh	2010-03-07 09:23:23 +0000
@@ -1,3 +1,3 @@
 #!/bin/bash
-xgettext --from-code=utf-8 --keyword=tr --default-domain=cms --output=boots.pot --files-from=potfiles.txt
+find ../boots/ -name *.py | xargs xgettext --language=Python --keyword="n_:1,2" --output=boots.pot --package-name="boots" --msgid-bugs-address="http://translations.launchpad.net/boots"
 

=== modified file 'tests/boots/api/api_tests.py'
--- tests/boots/api/api_tests.py	2010-02-27 05:40:10 +0000
+++ tests/boots/api/api_tests.py	2010-03-07 09:23:23 +0000
@@ -28,7 +28,7 @@
 import boots_unit_test
 
 class TestServerConnections(boots_unit_test.BootsQueryTester):
-    """Class that provides unit tests that test the api.Server class' ability
+    """Class that provides unit tests that test the api.DrizzleServer class' ability
     to connect to servers as well as provide proper errors when connections
     should fail."""
     #FIXME should use the configuration provided.
@@ -38,54 +38,54 @@
         pass
 
     def test_valid_connect_fqdn(self):
-        server = api.Server("capstonedd.cs.pdx.edu", 9306, {})
+        server = api.DrizzleServer("capstonedd.cs.pdx.edu", 9306, {})
         server.connect()
         self.assert_(server.is_connected)
         server.disconnect()
 
     def test_valid_connect_partial(self):
-        server = api.Server("capstonedd", 9306, {})
+        server = api.DrizzleServer("capstonedd", 9306, {})
         server.connect()
         self.assert_(server.is_connected)
         server.disconnect()
 
     def test_valid_connect_ip(self):
-        server = api.Server("131.252.214.178", 9306, {})
+        server = api.DrizzleServer("131.252.214.178", 9306, {})
         server.connect()
         self.assert_(server.is_connected)
         server.disconnect()
 
     def test_valid_connect_fqdn_with_db(self):
         boots_unit_test.BootsQueryTester.setUp(self)
-        server = api.Server("capstonedd.cs.pdx.edu", 9306, {"database": "fec"})
+        server = api.DrizzleServer("capstonedd.cs.pdx.edu", 9306, {"database": "fec"})
         server.connect()
         self.assert_(server.is_connected)
         server.disconnect()
 
     def test_invalid_connect(self):
-        server = api.Server("kororaa.cs.pdx.edu", 9306, {})
+        server = api.DrizzleServer("kororaa.cs.pdx.edu", 9306, {})
         self.assertRaises(errors.InterfaceError, server.connect)
         self.assert_(not server.is_connected)
 
     def test_valid_disconnect(self):
-        server = api.Server("capstonedd.cs.pdx.edu", 9306, {})
+        server = api.DrizzleServer("capstonedd.cs.pdx.edu", 9306, {})
         server.connect()
         server.disconnect()
         self.assert_(not server.is_connected)
 
     def test_invalid_disconnect(self):
-        server = api.Server("kororaa.cs.pdx.edu", 9306, {})
+        server = api.DrizzleServer("kororaa.cs.pdx.edu", 9306, {})
         self.assertRaises(errors.InterfaceError, server.connect)
         self.assertRaises(AttributeError, server.disconnect)
         self.assert_(not server.is_connected)
 
 class TestServerExecute(boots_unit_test.BootsQueryTester):
-    """Class that provides unit tests that tests api.Server class' ability
+    """Class that provides unit tests that tests api.DrizzleServer class' ability
     to execute SQL statements on a server."""
     #FIXME needs to test more than just SELECT statements.
     def setUp(self):
         boots_unit_test.BootsQueryTester.setUp(self)
-        self.server = api.Server(self.config["host"], self.config["port"], {"database": self.config["database"]})
+        self.server = api.DrizzleServer(self.config["host"], self.config["port"], {"database": self.config["database"]})
         self.server.connect()
 
     def tearDown(self):

=== removed file 'tests/boots/lib/lingos/cand_correct.txt'
--- tests/boots/lib/lingos/cand_correct.txt	2010-02-21 21:24:59 +0000
+++ tests/boots/lib/lingos/cand_correct.txt	1970-01-01 00:00:00 +0000
@@ -1,256 +0,0 @@
-H0AK00089,CRAWFORD, HARRY T JR,H,AK,DEM,4350 BUTTE CIR,ANCHORAGE,AK,99504
-H0AL00016,BOZEMAN, MARTHA RENEE,H,AL,UNK,PO BOX 2512,BIRMINGHAM,AL,35201
-H0AL01030,GOUNARES, PETER HUNTER,H,AL,REP,4881 CYPRESS VILLAGE BLVD UNIT E,ORANGE BEACH,AL,36561
-H0AL02095,JOHN, ROBERT E JR,H,AL,IND,1465 W OVERBROOK ROAD,MILLBROOK,AL,36054
-H0AL02103,BARBER, RICK JOE,H,AL,REP,211 ARROWHEAD DRIVE,MONTGOMERY,AL,36117
-H0AL05163,BROOKS, MO,H,AL,REP,7610 FOXFIRE DRIVE,HUNTSVILLE,AL,35802
-H0AL06088,COOKE, STANLEY KYLE,H,AL,REP,723 CHERRY BROOK ROAD,KIMBERLY,AL,35091
-H0AL06096,LAMBERT, PAUL ANTHONY,H,AL,REP,POST OFFICE BOX 244,MAYLENE,AL,35114
-H0AL07086,SEWELL, TERRYCINA ANDREA,H,AL,DEM,PO BOX 1964,BIRMINGHAM,AL,35201
-H0AL07094,HILLIARD, EARL FREDERICK JR,H,AL,DEM,PO BOX 12804,BIRMINGHAM,AL,35202
-H0AL07102,SMOOT, SHEILA,H,AL,DEM,PO BOX 1354,BIRMINGHAM,AL,35201
-H0AL07128,MOKOLO, PATRICIA EVANS,H,AL,DEM,15 EL DORADO EAST,TUSCALOOSA,AL,35405
-H0AL07136,LANKSTER, FRANK,H,AL,DEM,1000 COATS AVE EAST,LINDEN,AL,367481608
-H0AL07144,WALLER, MICHELE,H,AL,REP,PO BOX 10711,BIRMINGHAM,AL,35202
-H0AR01083,CRAWFORD, ERIC ALAN RICK,H,AR,REP,34 CR 455,JONESBORO,AR,72404
-H0AR01091,GREGORY, JAMES CHRISTOPHER,H,AR,DEM,510 S LILLY ST,BLYTHEVILLE,AR,72315
-H0AR02099,MEEKS, DAVID MARK EMERSON,H,AR,REP,3130 DAVE WARD DR,CONWAY,AR,72034
-H0AR02107,GRIFFIN, JOHN TIMOTHY,H,AR,REP,1819 NORTH TYLER STREET,LITTLE ROCK,AR,72217
-H0AR02115,WALLACE, SCOTT,H,AR,REP,PO BOX 242600,LITTLE ROCK,AR,72223
-H0AR03022,SKOCH, BERNARD KURT BERNIE'',H,AR,REP,21142 KIRKSEY ROAD,ELKINS,AR,72727
-H0AR03030,WHITAKER, DAVID JEFFREY,H,AR,DEM,PO BOX 957,FAYETTEVILLE,AR,727020957
-H0AR04038,ROSS, MICHAEL AVERY,H,AR,DEM,PO BOX 360,PRESCOTT,AR,71857
-H0AS00018,FALEOMAVAEGA, ENI,H,AS,DEM,PO BOX 44669,WASHINGTON,DC,20026
-H0AZ01184,FLAKE, JEFF MR.,H,AZ,REP,4222 E. MCLELLAN, NO. 19,MESA,AZ,85205
-H0AZ01259,GOSAR, PAUL ANTHONY,H,AZ,REP,7485 RAIN VALLEY RD,FLAGSTAFF,AZ,86004
-H0AZ01267,BEAUCHAMP, BRADLEY DON,H,AZ,REP,PO BOX 222,GLOBE ,AZ,85502
-H0AZ01275,BOWERS, RUSSELL WESLEY,H,AZ,REP,PO BOX 336,SUPERIOR,AZ,85173
-H0AZ03305,HULBURD, JON,H,AZ,DEM,4340 E INDIAN SCHOOL RD #21-467,PHOENIX,AZ,85018
-H0AZ04485,HILL, BRIAN,H,AZ,IND,PO BOX 6013,PHOENIX,AZ,85005
-H0AZ05078,WARD, JIM,H,AZ,REP,9342 EAST SANDS DRIVE,SCOTTSDALE,AZ,85255
-H0AZ05086,WNUCK, ERIC,H,AZ,REP,8630 E WINDROSE,SCOTTSDALE,AZ,85260
-H0AZ05094,SMITH, JEFFREY W,H,AZ,REP,3713 E ENCINAS AVE,GILBERT,AZ,85234
-H0AZ05102,SALVINO, CHRIS,H,AZ,REP,7694 E ROSE GARDEN LANE,SCOTTSDALE,AZ,85255
-H0AZ06043,KELSEY, EASTON CLINT,H,AZ,REP,3927 S RIM RD,GILBERT,AZ,85297
-H0AZ07017,MCCLUNG, RUTH CRAWFORD,H,AZ,REP,3963 W PROSPERITY MINE PL,TUCSON,AZ,85745
-H0AZ08015,KELLY, JESSE,H,AZ,REP,7481 W PHOBOS DR,TUCSON,AZ,85743
-H0AZ08023,GOSS, VINCENT ANDREW (ANDY),H,AZ,REP,4617 TERRITORIAL LP,SIERRA VISTA,AZ,85635
-H0AZ08031,MILLER, BRIAN ALLAN,H,AZ,REP,PO BOX 15023,TUCSON,AZ,857085023
-H0AZ08049,CARLSON, THOMAS A JR,H,AZ,REP,9598 N ELAN LANE,TUCSON,AZ,85742
-H0CA00066,FINK, MARI HAMLIN,H,CA,REP,3410 BANGOR PLACE,SAN DIEGO,CA,92106
-H0CA02120,STIGLICH, PETER VINCENT,H,CA,REP,14684 SINGING TREES LANE,COTTONWOOD,CA,96022
-H0CA03078,BERA, AMERIASH,H,CA,DEM,61707 PIRATE POINT CT,ELK GROVE,CA,95758
-H0CA03086,DAVIS, GARY,H,CA,DEM,510 BERCUT DRIVE SUITE S,SACRAMENTO,CA,95811
-H0CA03094,SLATON, BILL,H,CA,DEM,555 CAPITOL MALL SUITE 1425,SACRAMENTO,CA,95814
-H0CA06089,ROMANOWSKY, PETER CHRISTIAN,H,CA,REP,300 NAPA ST #40,SAUSACITO,CA,94965
-H0CA08069,DENNIS, JOHN,H,CA,REP,1592 UNION STREET,SAN FRANCISCO,CA,941234531
-H0CA08077,SHIELDS, SUMMER J,H,CA,DEM,PO BOX 882472,SAN FRANCISCO,CA,94188
-H0CA10073,DESAULNIER, MARK,H,CA,DEM,POST OFFICE BOX 6066,CONCORD,CA,94524
-H0CA10081,HAMPTON, ADRIEL,H,CA,DEM,5425 DE MARCUS BLVD., APT 104,DUBLIN,CA,94568
-H0CA10099,BUCHANAN, JOAN,H,CA,DEM,555 CAPITOL MALL, SUITE 1425,SACRAMENTO,CA,95814
-H0CA10107,WOODS, ANTHONY MR,H,CA,DEM,PO BOX 28,FAIRFIELD,CA,94533
-H0CA10115,VANGUNDY, GINO W,H,CA,IND,1500 OLIVER ROAD #K259,FAIRFIELD,CA,94533
-H0CA10123,HARMER, DAVID JEFFREY,H,CA,REP,9321 SILVERBEND LANE,ELK GROVE,CA,95624
-H0CA10131,ATTWOOD, TIFFANY,H,CA,DEM,939 RICHARD LANE,DANVILLE,CA,94526
-H0CA10149,GARAMENDI, JOHN,H,CA,DEM,C/O CALIFORNIA POLITICAL LAW, INC.,LONG BEACH,CA,90807
-H0CA10156,BUNCH, CHRISTOPHER N,H,CA,REP,1652 W TEXAS ST SUITE 258,FAIRFIELD,CA,94533
-H0CA10164,CLOWARD, JEREMY,H,CA,GRE,1713 MARY DRIVE,PLEASANT HILL,CA,94523
-H0CA10180,CLIFT, GARY WILLIAM,H,CA,REP,PO BOX 841,DIXON,CA,95620
-H0CA10198,LOOS, MARK ALAN,H,CA,REP,5631 CARNEGIE WAY,LIVERMORE,CA,94550
-H0CA10206,TOTH, JOHN RICHARD,H,CA,REP,2270 BACON STREET,CONCORD,CA,94520
-H0CA11295,DEL ARROZ, JONATHAN MR.,H,CA,REP,656 TUNBRIDGE ROAD,DANVILLE,CA,945263651
-H0CA11303,GOEHRING, BRAD,H,CA,REP,21500 CLEMENTS ROAD,ACAMPO,CA,95220
-H0CA11329,BEADLES, ROBERT,H,CA,REP,1040 W KETTLEMAN LANE #388,LODI,CA,95240
-H0CA11337,AMADOR, ANTONIO C,H,CA,REP,30151 TOMAS,RCHO STA MARGARITA,CA,92688
-H0CA11345,TAKADA, JEFFREY DAVID,H,CA,REP,1081 BRENDA LEE DRIVE,MANTECA,CA,95337
-H0CA11352,EMKEN, ELIZABETH,H,CA,REP,243 MORRIS RANCH COURT,DANVILLE,CA,94526
-H0CA15148,HONDA, MIKE,H,CA,DEM,P.O. BOX 8180,SAN JOSE,CA,95155
-H0CA15171,SIMITIAN, S. JOSEPH,H,CA,DEM,2059 CAMDEN AVENUE #281,SAN JOSE,CA,95124
-H0CA15189,BARICH, DON,H,CA,REP,1071 WILMINGTON AVE,SAN JOSE,CA,95129
-H0CA16088,HOWELL, ROBERT PAUL,H,CA,REP,1145 ARDSLEY CT,SAN JOSE,CA,951201783
-H0CA18050,BERRYHILL, MICHAEL CLARE SR,H,CA,REP,1842 EAST TAYLOR ROAD,CERES,CA,95307
-H0CA19124,MARSDEN, LES,H,CA,DEM,7145 SNYDER CREEK ROAD,MARIPOSA,CA,953389641
-H0CA19132,GOODWIN, LORAINE,H,CA,DEM,1009 W FOURTH STREET,MADERA,CA,93637
-H0CA19173,DENHAM, JEFF,H,CA,REP,941 E MONTE VISTA,TURLOCK,CA,95381
-H0CA20080,MILLER, JOSHUA THOMAS COULSTON,H,CA,REP,PO BOX 711,HANFORD,CA,93277
-H0CA20098,VIDAK, JAMES ANDREW,H,CA,REP,13775 LACY BLVD,VISALIA,CA,93230
-H0CA20114,LAKE, RICHARD DAVID GEORGE,H,CA,REP,7005 N MAPLE AVE SUITE 101,FRESNO,CA,93720
-H0CA23043,KALEMKARIAN, TIMOTHY CHARLES,H,CA,REP,PO BOX 3272,WESTLAKE VILLAGE,CA,91359
-H0CA23092,STOCKDALE, DAVID R,H,CA,REP,2151 S COLLEGE DR SUITE 101,SANTA MARIA,CA,93455
-H0CA23100,DAVIDSON, JOHN,H,CA,REP,1710 N MOORPARK ROAD SUITE 18,THOUSAND OAKS,CA,91360
-H0CA24108,STERN, SHAWN,H,CA,DEM,1212 S VICTORY BLVD,BURBANK,CA,91502
-H0CA24116,ALLISON, TIMOTHY JAMES,H,CA,DEM,PO BOX 4304,SANTA BARBARA,CA,93140
-H0CA27085,SCHIFF, ADAM,H,CA,DEM,777 S. FIGUEROA ST., STE. 4050,LOS ANGELES,CA,90017
-H0CA28091,FROYD, ERIK MERLIN,H,CA,REP,PO BOX 6455,BURBANK,CA,91510
-H0CA29081,LARGE, MORTON R,H,CA,REP,PO BOX 5003,BURBANK,CA,91504
-H0CA30063,DAVID, ARI,H,CA,REP,PO BOX 163,MALIBU,CA,90265
-H0CA30071,FLUTIE, ROBERT A,H,CA,REP,888 S FIGUEROA #860,LOS ANGELES,CA,90017
-H0CA30089,BENNING, DAVID,H,CA,REP,5931 WOODLAND VIEW DRIVE,WOODLAND HILLS,CA,913671075
-H0CA32101,CHU, JUDY,H,CA,DEM,777 S. FIGUEROA ST., STE.4050,LOS ANGELES,CA,90017
-H0CA32119,ROMERO, GLORIA,H,CA,,PO BOX 32398,LOS ANGELES,CA,90032
-H0CA32127,CEDILLO, GILBERT,H,CA,DEM,1212 S VICTORY BLVD,BURBANK,CA,91502
-H0CA32135,HERNANDEZ, TERESA,H,CA,REP,2001 SANTA ANITA AVENUE, #103,SOUTH EL MONTE,CA,91733
-H0CA32176,ALONSO, FRANCISCO,H,CA,DEM,415-A N SIERR VISTA ST,MONTEREY PARK,CA,91755
-H0CA32192,ARIF, MOHAMMAD,H,CA,PAF,11520 JEFFERSON BOULEVARD, #201,CULVER CITY,CA,90230
-H0CA32200,BLAKE, M. WAYNE,H,CA,REP,506 EAST 9THSTREET, #2,AZUSA,CA,91702
-H0CA32218,CHU, BETTY,H,CA,REP,645 BARNUM WAY,MONTEREY PARK,CA,91754
-H0CA32226,DURAN, BENITA,H,CA,DEM,313 NORTH RECORD AVENUE,EAST LOS ANGELES,CA,90063
-H0CA32234,ESTRADA, ANDRES,H,CA,DEM,3700 EAGLE STREET,LOS ANGELES,CA,90063
-H0CA32242,LYSENKO, STEFAN (CONTRERAS),H,CA,DEM,P.O. BOX 58024,VAN NUYS,CA,91413
-H0CA32259,MORRISON, WILLIAM (RODRIGUEZ),H,CA,REP,2728 CINCINNATI STREET,LOS ANGELES,CA,90033
-H0CA32267,MOSTERT, NICK JUAN,H,CA,DEM,P.O. BOX 428,MONTEREY PARK,CA,91754
-H0CA32291,SANTANA, SALVADOR,H,CA,REP,1928 WEST KENOAK DRIVE,WEST COVINA,CA,91790
-H0CA32309,WONG, MARGARITA MARIE,H,CA,DEM,P.O. BOX 416,SAN GABRIEL,CA,91778
-H0CA32317,SCARBOROUGH, LARRY DEAN,H,CA,REP,POST OFFICE BOX 341174,LOS ANGELES,CA,900349174
-H0CA36128,KESTERSON, PETE,H,CA,REP,800 S PACIFIC COAST HWY #8-305,REDONDO BEACH,CA,90277
-H0CA36136,FEIN, MATTIE,H,CA,REP,PO BOX 2006,REDONDO BEACH,CA,90278
-H0CA39080,ANDRE, LARRY STEVEN,H,CA,REP,7033 MCMANUS STREET,LAKEWOOD,CA,90713
-H0CA42167,MCGROARTY, LEE,H,CA,REP,15338 CENTRAL AVENUE,CHINO,CA,947107658
-H0CA42175,LIBERATORE, PHILIP LAURENCE,H,CA,REP,14702 ROMERO DRIVE,WHITTIER,CA,90605
-H0CA45061,THIBODEAU, CLAYTON DEL,H,CA,REP,3800 W DEVONSHIRE AVE #D-128,HEMET,CA,92545
-H0CA47067,TRAN, VAN,H,CA,REP,8856 CITRUS AVE,WESTMINSTER,CA,92683
-H0CA47083,IGLESIAS, CECILIA PATRICIA,H,CA,IND,1322 S ARAPAHO DR,SANTA ANA,CA,92704
-H0CA48024,ISSA, DARRELL,H,CA,REP,PO BOX 760,VISTA,CA,92085
-H0CA48131,KROM, BETH,H,CA,DEM,1212 S VICTORY BLVD,BURBANK,CA,91502
-H0CA49055,DAVIS, SUSAN A,H,CA,DEM,5241 CANTERBURY DR.,SAN DIEGO,CA,92116
-H0CA49089,KATZ, HOWARD LOUIS,H,CA,DEM,35125 CALLE NOPAL,TEMECULA,CA,92592
-H0CA50061,EMBLEM, TRACY,H,CA,DEM,205 W. 5TH AVENUE SUITE 105,ESCONDIDO,CA,92025
-H0CA51028,MCLEROY, WILLIAM DAVID,H,CA,REP,3862 GATTY ST,SAN DIEGO,CA,92154
-H0CA53016,FRIEDMAN, MATT,H,CA,REP,302 WASHINGTON #942,SAN DIEGO,CA,92103
-H0CA53024,ARRINGTON, RANDALL STEVEN PHD,H,CA,REP,5206 MERRICK DRIVE,PEACHTREE CITY,GA,30269
-H0CA53032,WEAVER, CLARENCE MASON,H,CA,REP,PO BOX 33451,SAN DIEGO,CA,92163
-H0CA53040,MERRIMAN, CHARLES MILLER II,H,CA,REP,1740 ROOSEVELT AVE #M,SAN DIEGO,CA,92109
-H0CO00013,BROWN, DIGGS,H,CO,UNK,125 S HOWES STREET,FORT COLLINS,CO,80521
-H0CO02134,BAILEY, STEPHEN,H,CO,REP,6664 CHEROKEE COURT,HIWOT,CO,80503
-H0CO02142,BRANCATO, BOB,H,CO,REP,534 HART SSTREET,FIRESTONE,CO,80520
-H0CO03074,BEESON, MARTIN C,H,CO,REP,1533 DOGWOOD DRIVE,RIFLE,CO,81650
-H0CO03082,THOMPSON, DOUGLAS BOMAR,H,CO,REP,2694 DEL MAR DRIVE,GRAND JUNCTION,CO,81506
-H0CO03090,MCCONNELL, ROBERT M,H,CO,REP,PO 883133,STEAMBOAT SPRINGS,CO,80488
-H0CO04114,LUCERO, THOMAS JOSEPH,H,CO,REP,PO BOX 921,JOHNSTOWN,CO,80534
-H0CO04122,GARDNER, CORY,H,CO,REP,PO BOX 2408,LOVELAND,CO,80539
-H0CO04130,MADERE, DEAN MATTHEW,H,CO,REP,4092 GOLF VISTA DR,LOVELAND,CO,80537
-H0CO06069,CANTER, DAVID,H,CO,DEM,303 WEST WINTERTHUR WAY,HIGHLANDS RANCH,CO,80139
-H0CO06077,FLERLAGE, JOHN,H,CO,DEM,PO BOX 1279,LITTLETON,CO,80160
-H0CO07018,CAMPBELL, BRIAN T SR,H,CO,REP,6164 CARR STREET,ARVADA,CO,80004
-H0CO07026,FRAZIER, RYAN L,H,CO,REP,PO BOX 140182,EDGEWATER,CO,802140182
-H0CO07034,DEMING, MICHAEL,H,CO,REP,1171 S SABLE BLVD UNIT F,AURORA,CO,800124900
-H0CO07042,SHEELY, MICHEL L,H,CO,REP,48065 EAST 38TH AVENUE,BENNETT,CO,80102
-H0CO07059,LAKEY, JIMMY,H,CO,REP,PO BOX 402,ARVADA,CO,800010402
-H0CO07067,SIAS, LANGHORNE C,H,CO,REP,15400 WEST 64TH AVENUE SUITE 9F,ARVADA,CO,80007
-H0CT02132,DALY, MATTHEW MOULTON,H,CT,REP,14 PASTURE LANE,SOUTH GLASTONBURY,CT,06073
-H0CT03072,DELAURO, ROSA,H,CT,DEM,49 HUNTINGTON STREET,NEW HAVEN,CT,06511
-H0CT03106,LABRIOLA, JERRY JR,H,CT,REP,8 AUTUM LEAVES ROAD,WALLINGFORD,CT,06492
-H0CT04120,GREGORY, WILL,H,CT,REP,PO BOX 972,STAMFORD,CT,06904
-H0CT04138,MERKLE, ROBERT,H,CT,REP,PO BOX 155,WILTON,CT,06897
-H0CT04146,DEBICELLA, DAN,H,CT,REP,1 LAZYBROOK ROAD,SHELTON,CT,06484
-H0CT04153,RUSSO, ROBERT,H,CT,REP,PO BOX 3493,BRIDGEPORT,CT,06055
-H0CT04161,TORRES, ENRIQUE RAUL,H,CT,REP,108 MIDLAND STREET,BRIDGEPORT,CT,06605
-H0CT05119,BERNIER, JUSTIN,H,CT,REP,PO BOX 207,PLAINVILLE,CT,06062
-H0CT05135,CARTER, DANIEL E,H,CT,REP,PO BOX 11331,WATERBURY,CT,06703
-H0CT05143,WESTBY, KIE,H,CT,REP,45 HOMESTEAD ROAD,SOUTHBURY,CT,06488
-H0CT05150,GREENBERG, MARK DANIEL,H,CT,REP,184 FERN AVENUE,LITCHFIELD,CT,06759
-H0CT05168,EVANS, WILLIAM J JR,H,CT,REP,325 CELIA DRIVE,WOLCOTT,CT,06705
-H0CT05176,CALIGIURI, SAM,H,CT,REP,PO BOX 11252,WATERBURY,CT,06703
-H0DE00084,SPENCER, SCOTT RICHARD,H,DE,DEM,PO BOX 484,WILMINGTON,DE,19899
-H0DE00092,CULLIS, FREDERICK R,H,DE,REP,601 ORIOLE PLACE,HOCKESSIN,DE,19707
-H0DE00100,LAFLANC, EARL R,H,DE,CON,,WYOMING,DE,19934
-H0DE00118,CAMPBELL, DOUGLAS ALLEN JR,H,DE,CON,5979 SUMMIT BRIDGE RD,TOWNSEND,DE,19734
-H0DE01017,CARNEY, JOHN CHARLES JR,H,DE,DEM,506 WEST 19TH STREET,WILMINGTON,DE,19802
-H0DE01025,IZZO, ROSE,H,DE,REP,2115 COVENTRY DRIVE,WILMINGTON,DE,198102851
-H0FL00023,KRAUSE, JOHN E,H,FL,REP,2350 TEATE AVE,PENSACOLA,FL,32504
-H0FL01096,KELLEY, HENRY ARTHUR JR,H,FL,UNK,548 MARY ESTHER CUTOFF UNIT 18-133,FORT WALTON BEACH,FL,32548
-H0FL02086,LAWSON, ALFRED AL' JR',H,FL,DEM,400 NORTH ADAMS ST,TALLAHASSEE,FL,32301
-H0FL02094,MCKAIN, PAUL CRANDALL,H,FL,OTH,PO BOX 71,LLOYD,FL,32337
-H0FL02102,MEECE, CARL EDWARD JR,H,FL,REP,20253 153RD PL,O'BRIEN,FL,32071
-H0FL02110,SOUTHERLAND, WILLIAM STEVE II,H,FL,REP,PO BOX 1692,LYNN HAVEN,FL,32444
-H0FL03068,GILMAN, JAMES NICHOLAS,H,FL,REP,550 WATER ST STE 1325,JACKSONVILLE,FL,32202
-H0FL03076,MARTIN-BACK, TERRY L,H,FL,NPA,10930 NW 9TH PL,GAINESVILLE,FL,32606
-H0FL03084,ANNARUMMA, JOHN CARL,H,FL,OTH,PO BOX 971,ALACHUA,FL,32616
-H0FL03092,MACNAUGHTON, GEORGE SCOTT,H,FL,LIB,10336 DEPAUL DR,JACKSONVILLE,FL,32218
-H0FL04066,CRENSHAW, ANDER HON,H,FL,REP,2358 RIVERSIDE AVENUE,JACKSONVILLE,FL,322044641
-H0FL04108,STANLEY, TROY DWAYNE,H,FL,REP,12436 HICKORY FOREST RD,JACKSONVILLE,FL,32226
-H0FL05105,DOOLAN, THOMAS JOSEPH,H,FL,DEM,2114 MEDINA HILLS LN,MASCOTTE,FL,34753
-H0FL05121,SAGER, JASON PATRICK,H,FL,REP,915 HAMMOCK RD,BROOKSVILLE,FL,34601
-H0FL06061,YOST, MICHAEL F 'MIKE',H,FL,REP,902 HALSEMA RD S,JACKSONVILLE,FL,321101020
-H0FL07051,BACON, STEPHEN,H,FL,NNE,257 BAYOU CIRCLE,DEBARY,FL,32713
-H0FL07069,SILVA, PETER,H,FL,DEM,891 E RED HOUSE BRANCH RD,ST AUGUSTINE,FL,32084
-H0FL07077,BEAVEN, HEATHER MAURINE,H,FL,DEM,203 LONDON DRIVE,PALM COAST,FL,321379709
-H0FL07085,MORRIS, RALPH LEROY,H,FL,UNK,8300 MORRISON ROAD,HASTINGS,FL,321453907
-H0FL08091,FANELLI, DANIEL ROY,H,FL,REP,2958 MARQUESAS CT,WINDERMERE,FL,347867825
-H0FL08109,SULLIVAN, PATRICIA ANNE,H,FL,REP,901 HASELTON ST,EUSTIS,FL,32726
-H0FL08117,DUNMIRE, PEG,H,FL,REP,13352 PALOMA DR,ORLANDO,FL,32837
-H0FL08125,GUTIERREZ, ARMANDO JR,H,FL,REP,2640A MITCHAM DRIVE,TALLAHASSEE,FL,32308
-H0FL08133,BUTLER, KEVIN MICHAEL,H,FL,REP,4453 WINDERWOOD CIRCLE,ORLANDO,FL,32835
-H0FL08141,BROWN, PRINCE,H,FL,REP,PO BOX 607812,ORLANDO,FL,32860
-H0FL08158,KELLY, KURT,H,FL,REP,PO BOX 533021,ORLANDO,FL,328533021
-H0FL10055,JUSTICE, CHARLIE,H,FL,DEM,3101 60TH STREET NORTH,ST PETERSBURG,FL,33170
-H0FL10063,FORCADE, ERIC LEE,H,FL,REP,PO BOX 128,PALM HARBOR,FL,346820128
-H0FL11137,KELLER, SCOTT THOMAS,H,FL,REP,8754 HANDEL LOOP,LAND O LAKES,FL,34637
-H0FL11145,STANFORD, STEVEN CRAIG,H,FL,REP,3106 W FAIR OAKS AVE,TAMPA,FL,33611
-H0FL11152,BUNTYN, TONY,H,FL,REP,4934 W SAN RAFAEL ST,TAMPA,FL,33629
-H0FL12101,ROSS, DENNIS ALAN,H,FL,REP,607 LAKE MIRIAM DRIVE,LAKELAND,FL,33813
-H0FL12119,EDWARDS, LORI,H,FL,DEM,4066 LAKE MARIANNA DRIVE,WINTER HAVEN,FL,33881
-H0FL12127,SNIDER, THOMAS K,H,FL,LIB,810 WALSINGHAM WAY,VALRICO,FL,33594
-H0FL12135,WILKINSON, RANDY,H,FL,REP,100 E HOOKER STREET,BARTOW,FL,33830
-H0FL12143,EDWARDS, RANDOLPH,H,FL,DEM,1609 GRAND HERITAGE BLVD,VALRICO,FL,33594
-H0FL12150,LINDSEY, JOHN W JR,H,FL,REP,385 STERLING DRIVE,WINTER HAVEN,FL,33884
-H0FL13109,GOLDEN, JAMES THEOPOLIS,H,FL,DEM,4815 11TH AVE CIR E,BRADENTON,FL,34208
-H0FL16045,CRAFT, CHRISTOPHER LEE,H,FL,DEM,PO BOX 1328,FT PIERCE,FL,34954
-H0FL17035,WILLIAMS, ANDRE LEWIS,H,FL,DEM,1850 NW 170TH STREET,MIAMI GARDENS,FL,33056
-H0FL17050,BASTIEN, MARLEINE M,H,FL,DEM,PO BOX 381255,MIAMI,FL,33238
-H0FL17068,WILSON, FREDERICA S,H,FL,DEM,19821 NW 2ND AVENUE,MIAMI GARDENS,FL,33169
-H0FL17076,BRUTUS, PHILLIP J,H,FL,DEM,16801 NE 6 AVENUE,N MIAMI BEACH,FL,33162
-H0FL17084,GIBSON, SHIRLEY,H,FL,DEM,PO BOX 694313,MIAMI GARDENS,FL,33269
-H0FL17092,VEREEN, RODERICK D,H,FL,DEM,14630 S RIVER DRIVE,MIAMI,FL,33167
-H0FL17100,ADAM, LEROY,H,FL,DEM,888 NE 89 ST APT D,MIAMI,FL,33138
-H0FL17118,MOISE, RUDOLPH,H,FL,DEM,PO BOX 680417,NORTH MIA,FL,331689998
-H0FL18025,ROS-LEHTINEN, ILEANA,H,FL,REP,POST OFFICE BOX 52-2784,MIAMI,FL,33152
-H0FL19049,RUIZ, JOSE M,H,FL,DEM,6875 HOULTON CIR,LAKE WORTH,FL,334678742
-H0FL19056,LAROSE, JOSUE,H,FL,DEM,929 SW 15TH STREET,DEERFIELD BEACH,FL,33441
-H0FL19072,BUDD, JOSEPH E,H,FL,UNK,10396 SUNSTREAM LANE,BOCA RATON,FL,33428
-H0FL19080,DEUTCH, THEODORE ELIOT,H,FL,DEM,12373 CASCADES POINTE DRIVE,BOCA RATON,FL,33428
-H0FL19098,MCCORMICK, JIM,H,FL,NPA,22465 TIKI DR,BOCA RATON,FL,33428
-H0FL20039,LOWRY, ROBERT PAUL,H,FL,REP,940 N NORTHLAKE DR,HOLLYWOOD,FL,33020
-H0FL20054,SCHOCK, CLAYTON JAMES,H,FL,OTH,641 WOODGATE LN,SUNRISE,FL,33326
-H0FL21029,SANCHEZ, WILLAIM,H,FL,DEM,9725 SW 140TH ST,MIAMI,FL,33176
-H0FL24015,MILLER, KENNETH JOHN,H,FL,REP,4098 SCARLET IRIS PL,WINTER PARK,FL,32792
-H0FL24023,DIEBEL, KAREN,H,FL,REP,941 GEORGIA AVE,WINTER PARK,FL,32789
-H0FL24031,HUKILL, DOROTHY L,H,FL,REP,5832 WALES AVENUE,PORT ORANGE,FL,32127
-H0FL24049,ADAMS, SANDY,H,FL,REP,PO BOX 1566,ORLANDO,FL,32802
-H0FL24056,CAMPBELL, SEAN FIELD,H,FL,REP,PO BOX 542846,MERRITT ISLAND,FL,32954
-H0FL24064,LONG, OMETRIAS DEON,H,FL,REP,POST OFFICE BOX 3119,WINTER PARK,FL,327903119
-H0FL24072,HEINZELMAN, JAMES P SR,H,FL,REP,2957 W ST RD 434 STE 200,LONGWOOD,FL,32779
-H0FL24080,MACINNES, CHAD,H,FL,REP,13638 CRYSTAL RIVER DRIVE,ORLANDO,FL,32828
-H0FL24098,SINCLAIR, LARRY,H,FL,UNK,9 SPRING DRIVE,PORT ORANGE,FL,32129
-H0FL24122,FOSTER, JAMES NORMAN,H,FL,REP,2116 ELMCREST PL,OVIEDO,FL,32765
-H0FL24130,GARCIA, GEORGE THOMAS,H,FL,REP,PO BOX 5037,TITUSVILLE,FL,32783
-H0GA02217,KEOWN, MICHAEL HUEL (MIKE),H,GA,REP,1086 W VIOLET AVE,COOLIDGE,GA,31738
-H0GA04023,LINDER, JOHN,H,GA,REP,PO BOX 4026,DULUTH,GA,30096
-H0GA04064,GAUSE, LAWRENCE FRANKLIN,H,GA,REP,PO BOX 225,TUCKER,GA,300850225
-H0GA04072,CARTER, LISBETH LIZ'',H,GA,REP,2639 BRIARLAKE RD NE,ATLANTA,GA,30345
-H0GA04080,JONES, VERNON A,H,GA,DEM,PO BOX 190496,ATLANTA,GA,31119
-H0GA08032,MARSHALL, JIM,H,GA,DEM,586 ORANGE STREET,MACON,GA,31201
-H0GA08040,DELOACH, KENNETH RAY JR,H,GA,REP,314 CHEYENNE DRIVE,WARNER ROBINS,GA,31093
-H0GA08065,HICKS, ANGELA,H,GA,REP,5962 ZEBULON ROAD BOX 306,MACON,GA,31210
-H0GA09022,EVANS, MIKE ALLEN,H,GA,REP,212 DAHLONEGA STREET,CUMMING,GA,30040
-H0GA09030,GRAVES, JOHN THOMAS JR,H,GA,REP,475 CRAIG ROAD,RANGER,GA,30734
-H0GA09055,STEPHENS, WILLIAM V,H,GA,REP,2300 BETHELVIEW ROAD,CUMMINGS,GA,30040
-H0GA09063,JONES, JEREMY EDWARD,H,GA,REP,190 PLAYHOUSE DRIVE,RINGGOLD,GA,30736
-H0GA09071,MOON, EDWARD 'EUGENE',H,GA,IND,3407 LAKE RIDGE PLACE,GAINESVILLE,GA,30506
-H0GA09089,HAWKINS, B LEE,H,GA,REP,4710 JIM HOOD ROAD,GAINESVILLE,GA,30506
-H0GA09097,TARVIN, THOMAS STEPHEN,H,GA,REP,PO BOX 365,CHICKAMAUGA,GA,307070365
-H0GA09105,FREEMAN, MIKE,H,GA,DEM,5194 GLENSTONE CT,GAINSVILLE,GA,30504
-H0GA09113,BENTON, CLYDE DANIEL,H,GA,REP,114 WASHINGTON ST,GAINESVILLE,GA,30501
-H0GA09121,LOFTMAN, BERTIL ARMIN,H,GA,REP,11342 BIG CANOE,JASPER,GA,30143
-H0GA09139,DOOLEY, THOMAS EUGENE,H,GA,REP,129 MORRIS DRIVE,RINGGOLD,GA,30736
-H0GA10228,CATES, CHRISTOPHER U MD,H,GA,REP,11 TIMBER GRACE COURT,BLAIRSVILLE,GA,30512
-H0GA12018,MOSLEY, EMMETT WAYNE JR,H,GA,REP,2107 ADAMS STREET,VIDALIA,GA,30474
-H0GA12026,SMITH, LAWTON CARLOS JR,H,GA,REP,3210 GILREATH DR,THUNDERBOLT,GA,31404
-H0GA12034,SEAVER, JEAN MARIE,H,GA,REP,63 RIVER BLUFF DRIVE,SAVANNAH,GA,31406
-H0GA13016,SLEEPER, SONJA,H,GA,REP,201 PORTER LN,JONESBORO,GA,30236
-H0GA13024,FRISBEE, MICHAEL,H,GA,IND,PO BOX 5,WINSTON,GA,30187
-H0HI01157,DJOU, CHARLES KONG,H,HI,REP,P O BOX 23580,HONOLULU,HI,96813
-H0HI01165,HANABUSA, COLLEEN WAKAKO,H,HI,DEM,92-1019 J KOIO DRIVE,KAPOLEI,HI,96707
-H0HI02106,WILLOUGHBY, JOHN WILLIAM,H,HI,REP,3054 ALA POHA PLACE APT 1811,HONOLULU,HI,968181678
-H0IA01109,BUDDE, JAMES R,H,IA,REP,23741 415TH AVE,BELLEVUE,IA,52031
-H0IA02107,SICARD, GARY JOSEPH,H,IA,LIB,585 BROUGHAM RD,ROBINS,IA,52328
\ No newline at end of file

=== modified file 'tests/boots/lib/lingos/lingo_tests.py'
--- tests/boots/lib/lingos/lingo_tests.py	2010-02-27 05:40:10 +0000
+++ tests/boots/lib/lingos/lingo_tests.py	2010-03-07 09:23:23 +0000
@@ -27,7 +27,7 @@
 from boots.app import client_config
 from boots.lib import console
 from boots.lib.lingos import lingo, bash_external, lisp, piped_sql, python, sql
-import filecmp
+import os
 import tempfile
 
 def node_graph_values(graph):
@@ -105,13 +105,13 @@
         super(TestPipedSQLInterpreter, self).setUp()
         self.sql = piped_sql.PipedSQLInterpreter(self.console)
 
-    def test_input_redirect(self):
+    def test_redirect(self):
         temp = tempfile.mkstemp(prefix = 'boots-test-file')[1]
         piped_sql_query = 'select * from cand; > {0}'.format(temp)
         graph = self.sql.execute(piped_sql_query)
         graph.start()
         graph.run()
-        self.assertTrue(filecmp.cmp(temp, 'lib/lingos/cand_correct.txt', False))
+        self.assertEqual(len(open(temp).readlines()), 1458)
 
 class TestPythonInterpreter(LingoBaseTester):
     def setUp(self):