Merge pull request #38 from stchris/release/1.1.1

Release preparation for 1.1.1

CHANGELOG.md

@@ -1,9 +1,16 @@
 Changelog
 ---------
 
-Unreleased
-- dropped support for Python 3.2
-- improved unit tests
+1.1.1
+- addded generic SAX feature toggle ([#26](https://github.com/stchris/untangle/pull/26))
+- added support for `hasattribute`/`getattribute` ([#15](https://github.com/stchris/untangle/pull/15))
+- added support for `len()` on parsed objects ([https://github.com/stchris/untangle/commit/31f3078]())
+- fixed a potential bug when trying to detect URLs ([https://github.com/stchris/untangle/commit/cfa11d16]())
+- include CDATA in `str` representation ([https://github.com/stchris/untangle/commit/63aaa]())
+- added support for parsing file-like objects ([#9](https://github.com/stchris/untangle/issues/9))
+- dropped support for Python 3.2 (untangle now supports Python versions 2.6, 2.7, 3.3, 3.4, 3.5, 3.6 and pypy)
+- improved unit test coverage and quality
+- better documentation and examples for accessing cdata
 
 1.1.0
 - __dir__ support for untangled objects

README.md

@@ -3,12 +3,8 @@ untangle
 
 [![Build Status](https://secure.travis-ci.org/stchris/untangle.png?branch=master)](http://travis-ci.org/stchris/untangle) [![Code Quality](https://landscape.io/github/stchris/untangle/master/landscape.png)](https://landscape.io/github/stchris/untangle/master) [![Coverage Status](https://coveralls.io/repos/stchris/untangle/badge.png)](https://coveralls.io/r/stchris/untangle) [![PyPi version](https://img.shields.io/pypi/v/untangle.svg)](https://pypi.python.org/pypi/untangle)
 
-
-[![Join the chat at https://gitter.im/stchris/untangle](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/stchris/untangle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 [Documentation](http://readthedocs.org/docs/untangle/en/latest/)
 
-
 * Converts XML to a Python object.
 * Siblings with similar names are grouped into a list.
 * Children can be accessed with ``parent.child``, attributes with ``element['attribute']``.
@@ -23,10 +19,6 @@ Installation
 pip install untangle
 ```
 
-OR
-
-try the latest [.deb](https://github.com/stchris/untangle/releases/download/1.1.0/python-untangle_1.1.0-1_all.deb)
-
 Usage
 -----
 (See and run <a href="https://github.com/stchris/untangle/blob/master/examples.py">examples.py</a> or this blog post: [Read XML painlessly](http://pythonadventures.wordpress.com/2011/10/30/read-xml-painlessly/) for more info)

docs/index.rst

@@ -42,7 +42,7 @@ and assuming it's available in a variable called `xml`, we could use untangle li
 
     doc = untangle.parse(xml)
     child_name = doc.root.child['name'] # 'child1'
-    
+
 For text/data inbetween tags, this is described as cdata. After specifying the relevant element as explained above, the data/cdata can be accessed by adding ".cdata" (without the quotes) to the end of your dictionary call.
 
 For more examples, have a look at (and launch) `examples.py <https://github.com/stchris/untangle/blob/master/examples.py/>`_.
@@ -54,7 +54,7 @@ It is recommended to use pip, which will always download the latest stable relea
 
     pip install untangle
 
-untangle works with Python versions 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6 and pypy
+untangle works with Python versions 2.6, 2.7, 3.3, 3.4, 3.5, 3.6 and pypy
 
 Motivation
 ----------
@@ -95,13 +95,7 @@ This will toggle the SAX handler feature described `here <https://docs.python.or
 Changelog
 ---------
 
-1.1.0
-- __dir__ support for untangled objects
-- code cleanups
-
-1.0.0
-- first official release
-
+see https://github.com/stchris/untangle/blob/master/CHANGELOG.md
 
 
 Indices and tables

untangle.py

@@ -25,7 +25,7 @@
 except ImportError:
     is_string = lambda x: isinstance(x, str)
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 
 
 class Element(object):