ConfigObj setup.py modified.

4 files changed, 63 insertions, 19 deletions

diff --git a/configobj.py b/configobj.py
index 8823b0b..e2e94a1 100644
--- a/configobj.py
+++ b/configobj.py
@@ -1,6 +1,6 @@
 # configobj.py
 # A config file reader/writer that supports nested sections in config files.
-# Copyright (C) 2005-2009 Michael Foord, Nicola Larosa
+# Copyright (C) 2005-2010 Michael Foord, Nicola Larosa
 # E-mail: fuzzyman AT voidspace DOT org DOT uk
 #         nico AT tekNico DOT net
 
@@ -16,7 +16,6 @@
 # http://lists.sourceforge.net/lists/listinfo/configobj-develop
 # Comments, suggestions and bug reports welcome.
 
-
 from __future__ import generators
 
 import os
diff --git a/docs/configobj.html b/docs/configobj.html
index efafd0f..dcaa7dc 100644
--- a/docs/configobj.html
+++ b/docs/configobj.html
@@ -816,7 +816,7 @@ instance to a freshly created state.</p>
 <p>A ConfigObj has the following attributes :</p>
 <ul class="simple">
 <li>indent_type</li>
-<li>interpolate</li>
+<li>interpolation</li>
 <li>stringify</li>
 <li>BOM</li>
 <li>initial_comment</li>
@@ -2190,8 +2190,8 @@ and added explicit keyword arguments instead. Use **options if you want
 to initialise a ConfigObj instance from a dictionary</li>
 <li>Constructing a ConfigObj from an existing ConfigObj instance now preserves
 the order of values and sections from the original instance in the new one</li>
-<li>BUGFIX: Checks that failed validation would not populate 'default_values' and
-'restore_default_value' wouldn't work for those entries</li>
+<li>BUGFIX: Checks that failed validation would not populate <tt class="docutils literal">default_values</tt> and
+<tt class="docutils literal">restore_default_value()</tt> wouldn't work for those entries</li>
 <li>BUGFIX: clear() now clears 'defaults'</li>
 <li>BUGFIX: empty values in list values were accidentally valid syntax. They now
 raise a <tt class="docutils literal">ParseError</tt>. e.g. &quot;value = 1, , 2&quot;</li>
diff --git a/setup.py b/setup.py
index 722f99a..3e7744c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 # setup.py
 # Install script for ConfigObj
-# Copyright (C) 2005-2009 Michael Foord, Mark Andrews, Nicola Larosa
+# Copyright (C) 2005-2010 Michael Foord, Mark Andrews, Nicola Larosa
 # E-mail: fuzzyman AT voidspace DOT org DOT uk
 #         mark AT la-la DOT com
 #         nico AT tekNico DOT net
@@ -13,19 +13,64 @@ from distutils.core import setup
 from configobj import __version__ as VERSION
 
 NAME = 'configobj'
+
 MODULES = 'configobj', 'validate'
+
 DESCRIPTION = 'Config file reading, writing, and validation.'
+
 URL = 'http://www.voidspace.org.uk/python/configobj.html'
-LICENSE = 'BSD'
-PLATFORMS = ["Platform Independent"]
-
-setup(name= NAME,
-      version= VERSION,
-      description= DESCRIPTION,
-      license = LICENSE,
-      platforms = PLATFORMS,
-      author= 'Michael Foord & Nicola Larosa',
-      author_email= 'fuzzyman@voidspace.org.uk',
-      url= URL,
-      py_modules = MODULES,
+
+DOWNLOAD_URL = "http://www.voidspace.org.uk/downloads/configobj-%s.zip" % VERSION
+
+LONG_DESCRIPTION = """**ConfigObj** is a simple but powerful config file reader and writer: an *ini
+file round tripper*. Its main feature is that it is very easy to use, with a
+straightforward programmer's interface and a simple syntax for config files.
+It has lots of other features though :
+
+* Nested sections (subsections), to any level
+* List values
+* Multiple line values
+* Full Unicode support
+* String interpolation (substitution)
+* Integrated with a powerful validation system
+
+    - including automatic type checking/conversion
+    - and allowing default values
+    - repeated sections
+
+* All comments in the file are preserved
+* The order of keys/sections is preserved
+* Powerful ``unrepr`` mode for storing/retrieving Python data-types
+
+Release 4.7.0 improves performance adds features for validation and
+fixes some bugs."""
+
+CLASSIFIERS = [
+    'Development Status :: 6 - Mature',
+    'Intended Audience :: Developers',
+    'License :: OSI Approved :: BSD License',
+    'Programming Language :: Python',
+    'Operating System :: OS Independent',
+    'Topic :: Software Development :: Libraries',
+    'Topic :: Software Development :: Libraries :: Python Modules',
+]
+
+AUTHOR = 'Michael Foord & Nicola Larosa'
+
+AUTHOR_EMAIL = 'fuzzyman@voidspace.org.uk'
+
+KEYWORDS = "config, ini, dictionary, application, admin, sysadmin, configuration, validation".split(', ')
+
+
+setup(name=NAME,
+      version=VERSION,
+      description=DESCRIPTION,
+      long_description=LONG_DESCRIPTION,
+      download_url=DOWNLOAD_URL,
+      author=AUTHOR,
+      author_email=AUTHOR_EMAIL,
+      url=URL,
+      py_modules=MODULES,
+      classifiers=CLASSIFIERS,
+      keywords=KEYWORDS
      )
diff --git a/test_configobj.py b/test_configobj.py
index 7331aa8..d4a3410 100644
--- a/test_configobj.py
+++ b/test_configobj.py
@@ -1,7 +1,7 @@
 # configobj_test.py
 # doctests for ConfigObj
 # A config file reader/writer that supports nested sections in config files.
-# Copyright (C) 2005-2009 Michael Foord, Nicola Larosa
+# Copyright (C) 2005-2010 Michael Foord, Nicola Larosa
 # E-mail: fuzzyman AT voidspace DOT org DOT uk
 #         nico AT tekNico DOT net