From 6bec583059b8737421873786c332467c5fd319e2 Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Tue, 22 Jan 2008 21:49:27 -0500
Subject: [PATCH] Refactor uwldap constants

---
 ceo/console/main.py    | 7 ++-----
 ceo/urwid/newmember.py | 4 ++--
 ceo/urwid/widgets.py   | 2 --
 ceo/uwldap.py          | 8 ++++++++
 4 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 ceo/uwldap.py

diff --git a/ceo/console/main.py b/ceo/console/main.py
index eff344e..f4573c7 100644
--- a/ceo/console/main.py
+++ b/ceo/console/main.py
@@ -3,9 +3,6 @@ from getopt import getopt
 from ceo import members, terms
 import ceo.ldapi as ldapi
 
-uwldap_uri = "ldap://uwldap.uwaterloo.ca/"
-uwldap_base = "dc=uwaterloo,dc=ca"
-
 shortopts = [
 ]
 
@@ -39,11 +36,11 @@ def memberlist(args):
 
 def updateprogram(args):
   mlist = members.list_all().items()
-  uwldap = ldap.initialize(uwldap_uri)
+  uwldap = ldap.initialize(uwldap_uri())
   fd = sys.stdin.fileno()
   for (dn, member) in mlist:
     uid = member['uid'][0]
-    user = uwldap.search_s(uwldap_base, ldap.SCOPE_SUBTREE,
+    user = uwldap.search_s(uwldap_base(), ldap.SCOPE_SUBTREE,
       '(uid=%s)' % ldapi.escape(uid))
     if len(user) == 0:
       continue
diff --git a/ceo/urwid/newmember.py b/ceo/urwid/newmember.py
index e8bcbea..bceda94 100644
--- a/ceo/urwid/newmember.py
+++ b/ceo/urwid/newmember.py
@@ -1,5 +1,5 @@
 import ldap, urwid
-from ceo import members, terms
+from ceo import members, terms, uwldap
 from ceo.urwid.widgets import *
 from ceo.urwid.window import *
 
@@ -51,7 +51,7 @@ class InfoPage(WizardPanel):
     def init_widgets(self):
         self.name = SingleEdit("Full name: ")
         self.program = SingleEdit("Program of Study: ")
-        self.userid = LdapFilterWordEdit(uwldap_uri, uwldap_base, 'uid',
+        self.userid = LdapFilterWordEdit(uwldap.uri(), uwldap.base(), 'uid',
             {'cn':self.name, 'ou':self.program}, "UWuserid: ")
         self.widgets = [
             urwid.Text( "Member Information - Please Check ID" ),
diff --git a/ceo/urwid/widgets.py b/ceo/urwid/widgets.py
index cddac0f..bcd4032 100644
--- a/ceo/urwid/widgets.py
+++ b/ceo/urwid/widgets.py
@@ -2,8 +2,6 @@ import urwid, ldap
 from ceo.urwid.window import raise_back, push_window
 import ceo.ldapi as ldapi
 
-uwldap_uri = "ldap://uwldap.uwaterloo.ca/"
-uwldap_base = "dc=uwaterloo,dc=ca"
 csclub_uri = "ldap://ldap1.csclub.uwaterloo.ca/ ldap://ldap2.csclub.uwaterloo.ca"
 csclub_base = "dc=csclub,dc=uwaterloo,dc=ca"
 
diff --git a/ceo/uwldap.py b/ceo/uwldap.py
new file mode 100644
index 0000000..37aabd8
--- /dev/null
+++ b/ceo/uwldap.py
@@ -0,0 +1,8 @@
+def uri():
+    return "ldap://uwldap.uwaterloo.ca/"
+
+def base():
+    return "dc=uwaterloo,dc=ca"
+
+def domain():
+    return 'uwaterloo.ca'