From 7254b4c880cac3af6eebb18f1c0034f90d443c36 Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Wed, 12 Dec 2007 01:15:12 -0500
Subject: [PATCH] Rename variables named 'type'

---
 pylib/csc/adm/members.py          |  8 ++++----
 pylib/csc/apps/urwid/groups.py    | 18 +++++++++---------
 pylib/csc/apps/urwid/newmember.py |  6 +++---
 pylib/csc/backends/ldapi.py       |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pylib/csc/adm/members.py b/pylib/csc/adm/members.py
index 73e9796..e36ac5d 100644
--- a/pylib/csc/adm/members.py
+++ b/pylib/csc/adm/members.py
@@ -270,15 +270,15 @@ def set_position(position, members):
     if len(mods['del']) == 0 and len(mods['add']) == 0:
         return
 
-    for type in ['del', 'add']:
-        for userid in mods[type]:
+    for action in ['del', 'add']:
+        for userid in mods[action]:
             dn = 'uid=%s,%s' % (escape(userid), user_base)
             entry1 = {'position' : [position]}
             entry2 = {} #{'position' : []}
             entry = ()
-            if type == 'del':
+            if action == 'del':
                 entry = (entry1, entry2)
-            elif type == 'add':
+            elif action == 'add':
                 entry = (entry2, entry1)
             mlist = ldap_connection.make_modlist(entry[0], entry[1])
             ceo_ldap.modify_s(dn, mlist)
diff --git a/pylib/csc/apps/urwid/groups.py b/pylib/csc/apps/urwid/groups.py
index 94be769..4acaf43 100644
--- a/pylib/csc/apps/urwid/groups.py
+++ b/pylib/csc/apps/urwid/groups.py
@@ -10,7 +10,7 @@ def menu_items(items):
     return [ urwid.AttrWrap( ButtonText( cb, data, txt ), 'menu', 'selected') for (txt, cb, data) in items ]
 
 def change_group_member(data):
-    push_wizard("%s %s Member" % (data["type"], data["name"]), [
+    push_wizard("%s %s Member" % (data["action"], data["name"]), [
         (ChangeMember, data),
         EndPage,
     ])
@@ -33,9 +33,9 @@ def group_members(data):
                 return
 
     add_data = data.copy()
-    add_data['type'] = 'Add'
+    add_data['action'] = 'Add'
     remove_data = data.copy()
-    remove_data['type'] = 'Remove'
+    remove_data['action'] = 'Remove'
     menu = [
         ("Add %s member" % data["name"].lower(),
             change_group_member, add_data),
@@ -96,7 +96,7 @@ class ChangeMember(WizardPanel):
 
         data = self.state['data']
         self.widgets = [
-            urwid.Text( "%s %s Member" % (data['type'], data['name']) ),
+            urwid.Text( "%s %s Member" % (data['action'], data['name']) ),
             urwid.Divider(),
             self.userid,
         ]
@@ -125,21 +125,21 @@ class EndPage(WizardPanel):
         pop_window()
     def activate(self):
         data = self.state['data']
-        type = data['type'].lower()
+        action = data['action'].lower()
         failed = []
         for group in data['groups']:
             try:
-                members.change_group_member(type, group, self.state['userid'])
+                members.change_group_member(action, group, self.state['userid'])
             except:
                 failed.append(group)
         if len(failed) == 0:
-            self.headtext.set_text("%s succeeded" % data['type'])
+            self.headtext.set_text("%s succeeded" % data['action'])
             self.midtext.set_text("Congratulations, the group modification "
                 "has succeeded.")
         else:
-            self.headtext.set_text("%s partially succeeded" % data['type'])
+            self.headtext.set_text("%s partially succeeded" % data['action'])
             self.midtext.set_text("Failed to %s member to %s for the "
                 "following groups: %s. This may indicate an attempt to add a "
                 "duplicate group member or to delete a non-present group "
-                "member." % (data['type'].lower(), data['name'],
+                "member." % (data['action'].lower(), data['name'],
                 ', '.join(failed)))
diff --git a/pylib/csc/apps/urwid/newmember.py b/pylib/csc/apps/urwid/newmember.py
index c966cd6..4706694 100644
--- a/pylib/csc/apps/urwid/newmember.py
+++ b/pylib/csc/apps/urwid/newmember.py
@@ -135,7 +135,7 @@ class PassPage(WizardPanel):
 
 class EndPage(WizardPanel):
     def __init__(self, state, utype='member'):
-        self.type = utype
+        self.utype = utype
         WizardPanel.__init__(self, state)
     def init_widgets(self):
         self.headtext = urwid.Text("")
@@ -152,10 +152,10 @@ class EndPage(WizardPanel):
     def activate(self):
         problem = None
         try:
-            if self.type == 'member':
+            if self.utype == 'member':
                 accounts.create_member( self.state['userid'], self.state['password'], self.state['name'], self.state['program'] )
                 members.register( self.state['userid'], terms.current() )
-            elif self.type == 'club':
+            elif self.utype == 'club':
                 accounts.create_club( self.state['userid'], self.state['name'] )
             else:
                 raise Exception("Internal Error")
diff --git a/pylib/csc/backends/ldapi.py b/pylib/csc/backends/ldapi.py
index 6fa426f..0b955a3 100644
--- a/pylib/csc/backends/ldapi.py
+++ b/pylib/csc/backends/ldapi.py
@@ -666,10 +666,10 @@ class Sasl:
     def __init__(self, mech, realm, userid, password):
         self.mech = mech
         if mech == 'GSSAPI':
-            type, arg = password
+            credtype, cred = password
             kinit_args = [ '/usr/bin/kinit', '%s@%s' % (userid, realm) ]
-            if type == 'keytab':
-                kinit_args += [ '-kt', arg ]
+            if credtype == 'keytab':
+                kinit_args += [ '-kt', cred ]
 
             kinit = Popen(kinit_args, stdin=PIPE, stdout=PIPE, stderr=PIPE)
             kinit.wait()