svn keywords

[plcapi.git] / PLC / PCUs.py

diff --git a/PLC/PCUs.py b/PLC/PCUs.py
index 5b69c0a..0bcaa67 100644 (file)
--- a/PLC/PCUs.py
+++ b/PLC/PCUs.py
@@ -4,7 +4,8 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: PCUs.py,v 1.9 2006/11/09 03:07:42 mlhuang Exp $
+# $Id$
+# $URL$
 #
 
 from PLC.Faults import *
@@ -12,7 +13,7 @@ from PLC.Parameter import Parameter
 from PLC.Filter import Filter
 from PLC.Debug import profile
 from PLC.Table import Row, Table
-from PLC.NodeNetworks import valid_ip, NodeNetwork, NodeNetworks
+from PLC.Interfaces import valid_ip, Interface, Interfaces
 from PLC.Nodes import Node, Nodes
 
 class PCU(Row):
@@ -111,6 +112,6 @@ class PCUs(Table):
                 pcu_filter = Filter(PCU.fields, {'pcu_id': pcu_filter})
             elif isinstance(pcu_filter, dict):
                 pcu_filter = Filter(PCU.fields, pcu_filter)
-            sql += " AND (%s)" % pcu_filter.sql(api)
+            sql += " AND (%s) %s" % pcu_filter.sql(api)
 
         self.selectall(sql)