diff options
| author | Rob Dennis <rdennis@gmail.com> | 2014-04-11 00:01:05 -0400 |
|---|---|---|
| committer | Rob Dennis <rdennis@gmail.com> | 2014-04-11 00:01:05 -0400 |
| commit | 5d816d951bd94c394cce82a048da1bac2c7bf9eb (patch) | |
| tree | cac42247b9b6c3d05b7434b2b3ef2740dff5d455 | |
| parent | 9cc1732a5c5f709d131a69f445e2cd1a4c12d9c6 (diff) | |
| parent | ccfaece2589e3d01715ed84ea28e3395fefc2507 (diff) | |
| download | configobj-git-5d816d951bd94c394cce82a048da1bac2c7bf9eb.tar.gz | |
Merge branch 'master' of github.com:DiffSK/configobj
| -rw-r--r-- | docs/configobj.rst | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/configobj.rst b/docs/configobj.rst index 763fee2..e5488be 100644 --- a/docs/configobj.rst +++ b/docs/configobj.rst @@ -895,7 +895,7 @@ newlines When a config file is read, ConfigObj records the type of newline separators in the file and uses this separator when writing. It defaults to ``None``, and ConfigObj -uses the system default (``os.sep``) if write is called without newlines having +uses the system default (``os.linesep``) if write is called without newlines having been set. @@ -90,7 +90,7 @@ KEYWORDS = "config, ini, dictionary, application, admin, sysadmin, configuration setup(name=NAME, version=VERSION, - install_requires=['six==1.5.2'], + install_requires=['six'], description=DESCRIPTION, long_description=LONG_DESCRIPTION, author=AUTHOR, |