Restrict usernames to lowercase, digits, and hyphens.

[zzz-floof.git] / floof / model / search.py

diff --git a/floof/model/search.py b/floof/model/search.py
index 2296491..fb86f35 100644 (file)
--- a/floof/model/search.py
+++ b/floof/model/search.py
@@ -1,7 +1,6 @@
 from elixir import *
 # from users import User
 
 from elixir import *
 # from users import User
 

-from floof.lib.search import do_search

 
 class SavedSearch(Entity):
     string = Field(Unicode) # I tried calling this query, but it broke elixir
 
 class SavedSearch(Entity):
     string = Field(Unicode) # I tried calling this query, but it broke elixir


@@ -13,6 +12,9 @@ class SavedSearch(Entity):
 
     @property
     def results(self):
 
     @property
     def results(self):

+        # This caused some cyclic dependencies when I tried importing it
+        # at the module level.  I wonder why that is...
+        from floof.lib.search import do_search

         return do_search(self.string)
 
 
         return do_search(self.string)