# HG changeset patch
# User Todd Larsen <tlarsen@google.com>
# Date 1222821787 0
# Node ID a18e93e21672861686fc85f95144bbd3d14e8c8d
# Parent  63e5f42e2e836691fdc316afbdc0c9a0c1bf5f67
Use the LINKNAME_PATTERN from its new home in key_name.py.  Also, add some
missing blank lines that are required by the style guide.

diff -r 63e5f42e2e83 -r a18e93e21672 app/soc/logic/site/id_user.py
--- a/app/soc/logic/site/id_user.py	Wed Oct 01 00:41:18 2008 +0000
+++ b/app/soc/logic/site/id_user.py	Wed Oct 01 00:43:07 2008 +0000
@@ -67,6 +67,7 @@
 
   return id
 
+
 def getUsersForOffsetAndLimit(offset=0, limit=0):
   """Returns Users entities for given offset and limit or None if not found.
     
@@ -79,6 +80,7 @@
   # Fetch one more to see if there should be a 'next' link
   return query.fetch(limit+1, offset)  
 
+
 def getUserFromId(id):
   """Returns User entity for a Google Account, or None if not found.  
     
@@ -87,6 +89,7 @@
   """
   return soc.models.user.User.gql('WHERE id = :1', id).get()
 
+
 def getUserIfMissing(user, id):
   """Conditionally returns User entity for a Google Account.
   
@@ -186,18 +189,7 @@
   return user.is_developer
 
 
-LINKNAME_PATTERN = r'''(?x)
-    ^
-    [0-9a-z]   # start with ASCII digit or lowercase
-    (
-     [0-9a-z]  # additional ASCII digit or lowercase
-     |         # -OR-
-     _[0-9a-z] # underscore and ASCII digit or lowercase
-    )*         # zero or more of OR group
-    $
-'''
-
-LINKNAME_REGEX = re.compile(LINKNAME_PATTERN)
+LINKNAME_REGEX = re.compile(key_name.LINKNAME_PATTERN)
 
 def isLinkNameFormatValid(link_name):
   """Returns True if link_name is in a valid format.