From 8a0689af07543296b35df7c446713434f542a9cf Mon Sep 17 00:00:00 2001
From: James Vega <jamessan@users.sourceforge.net>
Date: Mon, 22 Oct 2007 17:34:59 +0000
Subject: [PATCH] Version 0.83.3

---
 ChangeLog       | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 RELNOTES        |  6 ++++++
 scripts/supybot |  2 +-
 setup.py        |  2 +-
 src/conf.py     |  2 +-
 5 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31067324e..286aa8944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+2007-10-22  James Vega <jamessan@supybot.com>
+
+	* Version 0.83.3!
+
+	* Added the BadWords plugin from supybot-plugins and updated the
+	plugin to allow kicking of people who use defined BadWords.
+
+	* Added support for different log levels on stdout vs the log file.
+
+	* Fixed a bug where the bot always reacted to invalid command floods
+	even if supybot.abuse.flood.invalidcommand indicated not to.
+	(Closes: #1716878)
+
+	* Fixed a bug where the RSS plugin would lower-case URLs, thus making
+	them impossible to retrieve.  (Closes: #1666786)
+
+	* Fixed ircmsgs.prettyPrint to handle unrecognized commands.
+	(Closes: #1630963)
+
+	* Fixed a bug in the Services plugin where the bot would continuously
+	send Ghost commands.
+
+	* Fixed Google.calc to handle a change in Google's HTML.
+
+	* Fixed a bug where Plugin.list was listing functions which weren't
+	valid commands.
+
+	* Fixed RSS's handling of encodings to eliminate some ascii conversion
+	errors.
+
+	* Updated the rssparser using plugins with the renamed and newer
+	feedparser 4.1 in order to properly handle Bugzilla RSS feeds.
+
+	* Updated PLUGIN_TUTORIAL to specify that the user needs to import
+	Python's random module.
+
+	* Updated the Web plugin so it uses HTMLParser over sgmllib's parser
+	since sgmllib's enters an infinite loop on invalid input.
+
+	* Updated getHelp() so callers can pass in the help string.  This is
+	used in the Factoids plugin to dynamically generate a help string
+	based on a config value.
+
+	* Updated questions.py so bolding is handled better.  User input,
+	default values, and defined choices are no longer bolded.
+
+	* Updated String.len to use wrap().  This greatly simplifies the
+	command and introduces better argument handling.
+
+	* Updated a few uses of sre to use re if the bot is running under
+	Python 2.5.
+
+	* Fixed test cases for mircColor and sorted (thanks dcraven).
+
+	* Updated assertAction's error message to give useful information
+	about what went wrong.
+
 2006-07-23  James Vega <jamessan@supybot.com>
 
 	* Version 0.83.2! (A long overdue bugfix release)
diff --git a/RELNOTES b/RELNOTES
index f9d41ea12..0863f230d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,9 @@
+Version 0.83.3
+
+Overdue bug fix and Python2.5-compatible release.  No significant changes to
+worry about from the user perspective.
+
+
 Version 0.83.2
 
 Mainly bug fix release.  The most noticeable change being a value of
diff --git a/scripts/supybot b/scripts/supybot
index 541701e49..5ddd3668a 100644
--- a/scripts/supybot
+++ b/scripts/supybot
@@ -123,7 +123,7 @@ def main():
     log.info('Total CPU time taken: %s seconds.', user+system)
     log.info('No more Irc objects, exiting.')
 
-version = '0.83.2+darcs'
+version = '0.83.3'
 if __name__ == '__main__':
     ###
     # Options:
diff --git a/setup.py b/setup.py
index 4c404b52f..a63cf184f 100644
--- a/setup.py
+++ b/setup.py
@@ -151,7 +151,7 @@ package_dir = {'supybot': 'src',
 for plugin in plugins:
     package_dir['supybot.plugins.' + plugin] = 'plugins/' + plugin
 
-version = '0.83.2+darcs'
+version = '0.83.3'
 setup(
     # Metadata
     name='supybot',
diff --git a/src/conf.py b/src/conf.py
index a7f220ff8..dfa7917e6 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -43,7 +43,7 @@ _pluginsDir = os.path.join(installDir, 'plugins')
 ###
 # version: This should be pretty obvious.
 ###
-version = '0.83.2+darcs'
+version = '0.83.3'
 
 ###
 # *** The following variables are affected by command-line options.  They are