Skip to content

Commit

Permalink
Merge branch 'release-5.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
kurtmckee committed Apr 16, 2015
2 parents dc3bd29 + c425f32 commit b3d9280
Show file tree
Hide file tree
Showing 20 changed files with 459 additions and 73 deletions.
14 changes: 13 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
coming in the next version:
5.2.0 - April 16, 2015
* Support PyPy
* Remove the HTTP Status 9001 test that caused unit test tracebacks
* Remove the completely-untested HTML tidy code
Expand All @@ -9,16 +9,28 @@ coming in the next version:
* Remove the rel_tag microformat parsing code
* Replace the regex-based RFC 822 date parser with a procedural one
* Replace the Python-licensed W3DTF date parser
* Support HTML5 audio/source/video element relative URL's
* Remove the unparsed itunes_keywords key from the result dictionary
* Fix issue 321 just a little more (yet another code path was missed)
* Issue 62 (support georss and gml namespaces)
* Issue 296 (GUID's are always treated like relative URI's)
* Issue 334 (media:restriction element content is not returned)
* Issue 335 (sub-elements of media:group are not parsed and returned)
* Issue 342 (support multiple dc:creator elements)
* Issue 357 (loose parser breaks ampersands in link element URL's)
* Issue 374 (support the Podlove Simple Chapters namespace)
* Issue 380 (support media:rating element)
* Issue 384 (fix chardet support in Python 3)
* Issue 389 (elements in unknown uppercase namespaces are ignored)
* Issue 392 (tags element subverts 'tags' key in result dictionary)
* Issue 396 (Podlove Simple Chapters version 1.0 causes a KeyError)
* Issue 399 (docs call `request_headers` parameter `extra_headers`)
* Issue 401 (support additional dcterms and media namespaces elements)
* Issue 404 (support asctime datetime strings with timezone information)
* Issue 407 (decode forward slashes encoded as character entities)
* Issue 421 (delay chardet invocation as long as possible)
* Issue 422 (add return types docstrings)
* Issue 433 (update the list of allowed MathML elements and attributes)

5.1.3 - December 9, 2012
* Consolidated and simplified the character encoding detection code
Expand Down
14 changes: 7 additions & 7 deletions README → README.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
feedparser - Parse Atom and RSS feeds in Python.

Copyright (c) 2010-2013 Kurt McKee <[email protected]>
Copyright (c) 2002-2008 Mark Pilgrim
| Copyright 2010-2015 Kurt McKee <[email protected]>
| Copyright 2002-2008 Mark Pilgrim
feedparser is open source. See the LICENSE file for more information.


Installation
============

Feedparser can be installed using distutils or setuptools by running:
Feedparser can be installed using distutils or setuptools by running::

$ python setup.py install

Expand All @@ -28,7 +28,7 @@ copy it to somewhere in your Python path.

If a copy of sgmllib.py was not included in your feedparser download, you can
grab a copy from the Python 2 standard library (preferably from the Python 2.7
series) and run the 2to3 tool on it:
series) and run the 2to3 tool on it::

$ 2to3 -w sgmllib.py

Expand All @@ -49,14 +49,14 @@ Documentation

The feedparser documentation is available on the web at:

http://packages.python.org/feedparser
https://pythonhosted.org/feedparser/

It is also included in its source format, ReST, in the docs/ directory. To
build the documentation you'll need the Sphinx package, which is available at:

http://sphinx.pocoo.org/

You can then build HTML pages using a command similar to:
You can then build HTML pages using a command similar to::

$ sphinx-build -b html docs/ fpdocs

Expand All @@ -67,7 +67,7 @@ Testing
=======

Feedparser has an extensive test suite that has been growing for a decade. If
you'd like to run the tests yourself, you can run the following command:
you'd like to run the tests yourself, you can run the following command::

$ python feedparsertest.py

Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# project information
project = u'feedparser'
copyright = u'2004-2008 Mark Pilgrim, 2010-2013 Kurt McKee'
version = u'5.1.3'
release = u'5.1.3'
copyright = u'2004-2008 Mark Pilgrim, 2010-2015 Kurt McKee'
version = u'5.2.0'
release = u'5.2.0'
language = u'en'

# documentation options
Expand Down
69 changes: 69 additions & 0 deletions docs/html-sanitization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -500,11 +500,17 @@ allowed by default (all others are stripped):
* annotation
* annotation-xml
* maction
* maligngroup
* malignmark
* math
* menclose
* merror
* mfenced
* mfrac
* mglyph
* mi
* mlabeledtr
* mlongdiv
* mmultiscripts
* mn
* mo
Expand All @@ -514,8 +520,15 @@ allowed by default (all others are stripped):
* mprescripts
* mroot
* mrow
* ms
* mscarries
* mscarry
* msgroup
* msline
* mspace
* msqrt
* msrow
* mstack
* mstyle
* msub
* msubsup
Expand All @@ -536,43 +549,99 @@ allowed by default (all others are stripped):
.. hlist::
:columns: 3

* accent
* accentunder
* actiontype
* align
* alignmentscope
* altimg
* altimg-height
* altimg-valign
* altimg-width
* alttext
* bevelled
* charalign
* close
* columnalign
* columnlines
* columnspacing
* columnspan
* columnwidth
* crossout
* decimalpoint
* denomalign
* depth
* dir
* display
* displaystyle
* edge
* encoding
* equalcolumns
* equalrows
* fence
* fontstyle
* fontweight
* form
* frame
* framespacing
* groupalign
* height
* href
* id
* indentalign
* indentalignfirst
* indentalignlast
* indentshift
* indentshiftfirst
* indentshiftlast
* indenttarget
* infixlinebreakstyle
* largeop
* length
* linebreak
* linebreakmultchar
* linebreakstyle
* lineleading
* linethickness
* location
* longdivstyle
* lquote
* lspace
* mathbackground
* mathcolor
* mathsize
* mathvariant
* maxsize
* minlabelspacing
* minsize
* movablelimits
* notation
* numalign
* open
* other
* overflow
* position
* rowalign
* rowlines
* rowspacing
* rowspan
* rquote
* rspace
* scriptlevel
* scriptminsize
* scriptsizemultiplier
* selection
* separator
* separators
* shift
* side
* src
* stackalign
* stretchy
* subscriptshift
* superscriptshift
* symmetric
* voffset
* width
* xlink:href
* xlink:show
Expand Down
8 changes: 4 additions & 4 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
Documentation
=============

This documentation claims to describe the behavior of :program:`Universal Feed
Parser` |version|. It does not claim to describe the behavior of any other version.
This documentation claims to describe the behavior of :program:`feedparser` |version|.
It does not claim to describe the behavior of any other version.

This documentation lives at `http://packages.python.org/feedparser/
<http://packages.python.org/feedparser/>`_. If you're reading it somewhere else, you may
This documentation lives at `https://pythonhosted.org/feedparser/
<https://pythonhosted.org/feedparser/>`_. If you're reading it somewhere else, you may
not have the latest version.

This documentation is provided by the author "as is" without any express or
Expand Down
4 changes: 4 additions & 0 deletions docs/resolving-relative-links.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ relative:
* <a href="...">
* <applet codebase="...">
* <area href="...">
* <audio src="...">
* <blockquote cite="...">
* <body background="...">
* <del cite="...">
Expand All @@ -97,6 +98,9 @@ relative:
* <object usemap="...">
* <q cite="...">
* <script src="...">
* <source src="...">
* <video poster="...">
* <video src="...">


How Relative :abbr:`URI (Uniform Resource Identifier)`\s Are Resolved
Expand Down
Loading

0 comments on commit b3d9280

Please sign in to comment.