Changeset 3521 for pykota/trunk/pykota/storages/ldapstorage.py
- Timestamp:
- 04/15/10 01:21:11 (14 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/ldapstorage.py
r3489 r3521 704 704 if result : 705 705 patterns = printerpattern.split(",") 706 try : 707 patdict = {}.fromkeys(patterns) 708 except AttributeError : 709 # Python v2.2 or earlier 710 patdict = {} 711 for p in patterns : 712 patdict[p] = None 706 patdict = {}.fromkeys(patterns) 713 707 for (printerid, fields) in result : 714 708 printername = databaseToUnicode(fields.get("pykotaPrinterName", [""])[0] or fields.get(self.info["printerrdn"], [""])[0]) … … 740 734 if result : 741 735 patterns = userpattern.split(",") 742 try : 743 patdict = {}.fromkeys(patterns) 744 except AttributeError : 745 # Python v2.2 or earlier 746 patdict = {} 747 for p in patterns : 748 patdict[p] = None 736 patdict = {}.fromkeys(patterns) 749 737 for (userid, fields) in result : 750 738 username = databaseToUnicode(fields.get("pykotaUserName", [""])[0] or fields.get(self.info["userrdn"], [""])[0]) … … 807 795 if result : 808 796 patterns = grouppattern.split(",") 809 try : 810 patdict = {}.fromkeys(patterns) 811 except AttributeError : 812 # Python v2.2 or earlier 813 patdict = {} 814 for p in patterns : 815 patdict[p] = None 797 patdict = {}.fromkeys(patterns) 816 798 for (groupid, fields) in result : 817 799 groupname = databaseToUnicode(fields.get("pykotaGroupName", [""])[0] or fields.get(self.info["grouprdn"], [""])[0]) … … 1823 1805 if result : 1824 1806 patterns = billingcodepattern.split(",") 1825 try : 1826 patdict = {}.fromkeys(patterns) 1827 except AttributeError : 1828 # Python v2.2 or earlier 1829 patdict = {} 1830 for p in patterns : 1831 patdict[p] = None 1807 patdict = {}.fromkeys(patterns) 1832 1808 for (codeid, fields) in result : 1833 1809 codename = databaseToUnicode(fields.get("pykotaBillingCode", [""])[0])