From: Joerg Jaspert Date: Fri, 30 Oct 2009 14:32:17 +0000 (+0100) Subject: Merge commit 'lamby/master' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c16123ef7acfa534bb4b2b95a586f84de3dd95e8;p=dak.git Merge commit 'lamby/master' into merge * commit 'lamby/master': (23 commits) 'as' is a reserved word in Python 2.6. Don't shadow 'file' builtin in daklib.queue. Use 4 spaces for indentation. Correct code to match documentation of Binary.check_utf8_package Remove unused 'time' import. Correct isinstance call; DictType is not an actual type. dak's "Dict" is a synonym of the 'dict' builtin Use foo.iteritems() to avoid reentrancy with foo[k]. Don't shadow 'map' builtin in daklib.utils.TemplateSubst Update comment about our monkeypatching of commands.getstatusoutput. Remove duplicated 'commands' import. Don't use deprecated string module. Remove unused imports from daklib.queue. Remove shadowing builtins in daklib.queue Remove daklib's now-unused extension functionality. Remove shadowing builtins in daklib.dbconn. Don't shadow 'dir' builtin in daklib.utils.get_changes_files We don't use re_is_orig_source in daklib.utils anymore. Don't shadow "dir" builtin. Fix uid references in DM upload error codepaths. ... Signed-off-by: Joerg Jaspert --- c16123ef7acfa534bb4b2b95a586f84de3dd95e8