Changeset 2754 for pykota/trunk/pykota/storages/sql.py
- Timestamp:
- 02/23/06 20:44:25 (18 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/sql.py
r2749 r2754 376 376 if result : 377 377 patterns = printerpattern.split(",") 378 try : 379 patdict = {}.fromkeys(patterns) 380 except AttributeError : 381 # Python v2.2 or earlier 382 patdict = {} 383 for p in patterns : 384 patdict[p] = None 378 385 for record in result : 379 386 pname = self.databaseToUserCharset(record["printername"]) 380 if self.tool.matchString(pname, patterns) :387 if patdict.has_key(pname) or self.tool.matchString(pname, patterns) : 381 388 printer = StoragePrinter(self, pname) 382 389 printer.ident = record.get("id") … … 404 411 if result : 405 412 patterns = userpattern.split(",") 413 try : 414 patdict = {}.fromkeys(patterns) 415 except AttributeError : 416 # Python v2.2 or earlier 417 patdict = {} 418 for p in patterns : 419 patdict[p] = None 406 420 for record in result : 407 421 uname = self.databaseToUserCharset(record["username"]) 408 if self.tool.matchString(uname, patterns) :422 if patdict.has_key(uname) or self.tool.matchString(uname, patterns) : 409 423 user = StorageUser(self, uname) 410 424 user.ident = record.get("id") … … 429 443 if result : 430 444 patterns = grouppattern.split(",") 445 try : 446 patdict = {}.fromkeys(patterns) 447 except AttributeError : 448 # Python v2.2 or earlier 449 patdict = {} 450 for p in patterns : 451 patdict[p] = None 431 452 for record in result : 432 453 gname = self.databaseToUserCharset(record["groupname"]) 433 if self.tool.matchString(gname, patterns) :454 if patdict.has_key(gname) or self.tool.matchString(gname, patterns) : 434 455 group = StorageGroup(self, gname) 435 456 group.ident = record.get("id")