rendered paste body--- old/bottlecap.py 2007-12-18 16:54:49.000000000 +0000+++ ../bottlecap.py 2007-12-19 17:32:15.000000000 +0000@@ -75,8 +75,8 @@ # No, don't remove the next line, bcsettings MUST be imported for this script to continue. import bcsettings -loaded_modules = ""-skipped_modules = ""+loaded_modules = []+skipped_modules = [] if (bcsettings.enable_libnotify == True): import bcnotify@@ -89,18 +89,10 @@ xchat.hook_print('Invited', bcnotify.Invite_handle) xchat.hook_print('Private Message', bcnotify.PRIVMSG_handle) xchat.hook_print('Private Message to Dialog', bcnotify.PRIVMSG_handle)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bcnotify"- else:- loaded_modules = "bcnotify"+ loaded_modules.append("bcnotify") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bcnotify"- else:- skipped_modules = "bcnotify"- + skipped_modules.append("bcnotify") if (bcsettings.bailiff_checkcaps) or (bcsettings.bailiff_checkpunctuation):@@ -118,53 +110,30 @@ xchat.hook_command('MSG', bcroam.msg_timer) xchat.hook_print('Channel Message', bcroam.away_check)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bcroam"- else:- loaded_modules = "bcroam"+ loaded_modules.append("bcroam") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bcroam"- else:- skipped_modules = "bcroam"- + skipped_modules.append("bcroam") if (bcsettings.enable_purser == True): import bcpurser xchat.hook_print('Join', bcpurser.auto_give_privilage)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bcpurser"- else:- loaded_modules = "bcpurser"+ loaded_modules.append("bcpurser") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bcpurser"- else:- skipped_modules = "bcpurser"+ skipped_modules.append("bcpurser") - if (bcsettings.enable_highlight_handler == True): import bchighlight xchat.hook_print('Channel Msg Hilight', bchighlight.handle_highlights)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bchighlight"- else:- loaded_modules = "bchighlight"+ loaded_modules.append("bchighlight") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bchighlight"- else:- skipped_modules = "bchighlight"+ skipped_modules.append("bchighlight") @@ -174,35 +143,20 @@ xchat.hook_command('SANICK', bcoperfunctions.sanick_replace) xchat.hook_command('SACYCLE', bcoperfunctions.sacycle_replace) xchat.hook_command('SAMOVE', bcoperfunctions.samove_replace)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bcoperfunctions"- else:- loaded_modules = "bcoperfunctions"+ loaded_modules.append("bcoperfunctions") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bcoperfunctions"- else:- skipped_modules = "bcoperfunctions"- + skipped_modules.append("bcoperfunctions") if (bcsettings.enable_correcting == True): import bccorrector xchat.hook_print('Channel Message', bccorrector.do_corrections, None, xchat.PRI_HIGHEST)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bccorrector"- else:- loaded_modules = "bccorrector"+ loaded_modules.append("bccorrector") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bccorrector"- else:- skipped_modules = "bccorrector"+ skipped_modules.append("bccorrector") @@ -210,17 +164,10 @@ import bcinvite xchat.hook_print('Invited', bcinvite.invite_handle)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bcinvite"- else:- loaded_modules = "bcinvite"+ loaded_modules.append("bcinvite") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bccorrector"- else:- skipped_modules = "bccorrector"+ skipped_modules.append("bccorrector") @@ -228,29 +175,18 @@ import bcclones xchat.hook_print('Join', bcclones.join_clone_check) xchat.hook_command('clones', bcclones.clone_detect)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bcclones"- else:- loaded_modules = "bcclones"+ loaded_modules.append("bcclones") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bcclones"- else:- skipped_modules = "bcclones"+ skipped_modules.append("bcclones") if (bcsettings.enable_regexpban == True): import bcregexpban xchat.hook_print('Join', bcregexpban.on_join_regexp_ban)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bcregexpban"- else:- loaded_modules = "bcregexpban"- + loaded_modules.append("bcregexpban")+ if (bcsettings.enable_phrasebook == True):@@ -259,19 +195,13 @@ xchat.hook_command("NODATING", bcphrasebook.nodating) xchat.hook_command("ENGLISH", bcphrasebook.english) xchat.hook_command("PCUSERS", bcphrasebook.pcusers)- - if (loaded_modules != ""):- loaded_modules = loaded_modules + ", bcphrasebook"- else:- loaded_modules = "bcphrasebook"+ loaded_modules.append("bcphrasebook") else:- if (skipped_modules != ""):- skipped_modules = skipped_modules + ", bcphrasebook"- else:- skipped_modules = "bcphrasebook"+ skipped_modules.append("bcphrasebook") -+skipped_modules = ', '.join(skipped_modules)+loaded_modules = ', '.join(loaded_modules) def bcinfo(word, word_eol, userdata): modules_info = {