From 96636540ed04d29d6726f253ae014e89ecb0713c Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Thu, 21 Aug 2014 10:12:43 -0400 Subject: 'http://packages.python.org/Markdown/' => 'https://pythonhosted.org/Markdown/'. The former redirects to the latter anyway. Might as well point to the actual destination. --- INSTALL.md | 2 +- README.md | 8 ++++---- markdown/__init__.py | 2 +- markdown/__main__.py | 2 +- markdown/extensions/attr_list.py | 2 +- markdown/extensions/codehilite.py | 4 ++-- markdown/extensions/fenced_code.py | 4 ++-- markdown/extensions/headerid.py | 4 ++-- markdown/extensions/meta.py | 2 +- markdown/extensions/nl2br.py | 2 +- markdown/extensions/toc.py | 2 +- markdown/extensions/wikilinks.py | 2 +- setup.py | 8 ++++---- tests/misc/em-around-links.html | 10 +++++----- tests/misc/em-around-links.txt | 10 +++++----- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 5f50ff4..6e6ab8c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -6,4 +6,4 @@ As an Admin/Root user on your system do: pip install markdown Or for more specific instructions, view the documentation in `docs/install.txt` -or on the website at . +or on the website at . diff --git a/README.md b/README.md index 715767b..a7f8550 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ though there are a few known issues. See [Features][] for information on what exactly is supported and what is not. Additional features are supported by the [Available Extensions][]. -[Python-Markdown]: http://packages.python.org/Markdown/ +[Python-Markdown]: https://pythonhosted.org/Markdown/ [Markdown]: http://daringfireball.net/projects/markdown/ -[Features]: http://packages.python.org/Markdown/index.html#Features -[Available Extensions]: http://packages.python.org/Markdown/extensions/index.html +[Features]: https://pythonhosted.org/Markdown/index.html#Features +[Available Extensions]: https://pythonhosted.org/Markdown/extensions/index.html Documentation @@ -24,7 +24,7 @@ Documentation Installation and usage documentation is available in the `docs/` directory of the distribution and on the project website at -. +. Support ------- diff --git a/markdown/__init__.py b/markdown/__init__.py index 740e932..59dda4c 100644 --- a/markdown/__init__.py +++ b/markdown/__init__.py @@ -10,7 +10,7 @@ called from the command line. import markdown html = markdown.markdown(your_text_string) -See for more +See for more information and instructions on how to extend the functionality of Python Markdown. Read that before you try modifying this file. diff --git a/markdown/__main__.py b/markdown/__main__.py index 8ee8c82..b463fdc 100644 --- a/markdown/__main__.py +++ b/markdown/__main__.py @@ -20,7 +20,7 @@ def parse_options(): usage = """%prog [options] [INPUTFILE] (STDIN is assumed if no INPUTFILE is given)""" desc = "A Python implementation of John Gruber's Markdown. " \ - "http://packages.python.org/Markdown/" + "https://pythonhosted.org/Markdown/" ver = "%%prog %s" % markdown.version parser = optparse.OptionParser(usage=usage, description=desc, version=ver) diff --git a/markdown/extensions/attr_list.py b/markdown/extensions/attr_list.py index f725a17..55b2f1f 100644 --- a/markdown/extensions/attr_list.py +++ b/markdown/extensions/attr_list.py @@ -14,7 +14,7 @@ License: BSD (see ../LICENSE.md for details) Dependencies: * [Python 2.4+](http://python.org) -* [Markdown 2.1+](http://packages.python.org/Markdown/) +* [Markdown 2.1+](https://pythonhosted.org/Markdown/) """ diff --git a/markdown/extensions/codehilite.py b/markdown/extensions/codehilite.py index e3c5b3d..6336cfc 100644 --- a/markdown/extensions/codehilite.py +++ b/markdown/extensions/codehilite.py @@ -6,14 +6,14 @@ Adds code/syntax highlighting to standard Python-Markdown code blocks. Copyright 2006-2008 [Waylan Limberg](http://achinghead.com/). -Project website: +Project website: Contact: markdown@freewisdom.org License: BSD (see ../LICENSE.md for details) Dependencies: * [Python 2.3+](http://python.org/) -* [Markdown 2.0+](http://packages.python.org/Markdown/) +* [Markdown 2.0+](https://pythonhosted.org/Markdown/) * [Pygments](http://pygments.org/) """ diff --git a/markdown/extensions/fenced_code.py b/markdown/extensions/fenced_code.py index 25163cf..4403ccd 100644 --- a/markdown/extensions/fenced_code.py +++ b/markdown/extensions/fenced_code.py @@ -75,14 +75,14 @@ If the codehighlite extension and Pygments are installed, lines can be highlight Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/). -Project website: +Project website: Contact: markdown@freewisdom.org License: BSD (see ../docs/LICENSE for details) Dependencies: * [Python 2.4+](http://python.org) -* [Markdown 2.0+](http://packages.python.org/Markdown/) +* [Markdown 2.0+](https://pythonhosted.org/Markdown/) * [Pygments (optional)](http://pygments.org) """ diff --git a/markdown/extensions/headerid.py b/markdown/extensions/headerid.py index 55e09ce..f96f239 100644 --- a/markdown/extensions/headerid.py +++ b/markdown/extensions/headerid.py @@ -63,14 +63,14 @@ Use with MetaData extension: Copyright 2007-2011 [Waylan Limberg](http://achinghead.com/). -Project website: +Project website: Contact: markdown@freewisdom.org License: BSD (see ../docs/LICENSE for details) Dependencies: * [Python 2.3+](http://python.org) -* [Markdown 2.0+](http://packages.python.org/Markdown/) +* [Markdown 2.0+](https://pythonhosted.org/Markdown/) """ diff --git a/markdown/extensions/meta.py b/markdown/extensions/meta.py index 8de2646..3d89946 100644 --- a/markdown/extensions/meta.py +++ b/markdown/extensions/meta.py @@ -32,7 +32,7 @@ Make sure text without Meta Data still works (markdown < 1.6b returns a

). Copyright 2007-2008 [Waylan Limberg](http://achinghead.com). -Project website: +Project website: Contact: markdown@freewisdom.org License: BSD (see ../LICENSE.md for details) diff --git a/markdown/extensions/nl2br.py b/markdown/extensions/nl2br.py index c355c13..eab4084 100644 --- a/markdown/extensions/nl2br.py +++ b/markdown/extensions/nl2br.py @@ -16,7 +16,7 @@ Copyright 2011 [Brian Neal](http://deathofagremmie.com/) Dependencies: * [Python 2.4+](http://python.org) -* [Markdown 2.1+](http://packages.python.org/Markdown/) +* [Markdown 2.1+](https://pythonhosted.org/Markdown/) """ diff --git a/markdown/extensions/toc.py b/markdown/extensions/toc.py index f1593b2..8ab8c03 100644 --- a/markdown/extensions/toc.py +++ b/markdown/extensions/toc.py @@ -5,7 +5,7 @@ Table of Contents Extension for Python-Markdown (c) 2008 [Jack Miller](http://codezen.org) Dependencies: -* [Markdown 2.1+](http://packages.python.org/Markdown/) +* [Markdown 2.1+](https://pythonhosted.org/Markdown/) """ diff --git a/markdown/extensions/wikilinks.py b/markdown/extensions/wikilinks.py index c2aab8f..cb20906 100644 --- a/markdown/extensions/wikilinks.py +++ b/markdown/extensions/wikilinks.py @@ -73,7 +73,7 @@ License: [BSD](http://www.opensource.org/licenses/bsd-license.php) Dependencies: * [Python 2.3+](http://python.org) -* [Markdown 2.0+](http://packages.python.org/Markdown/) +* [Markdown 2.0+](https://pythonhosted.org/Markdown/) ''' from __future__ import absolute_import diff --git a/setup.py b/setup.py index 0702f6b..568e8c5 100755 --- a/setup.py +++ b/setup.py @@ -200,8 +200,8 @@ on what exactly is supported and what is not. Additional features are supported by the `Available Extensions`_. .. _Markdown: http://daringfireball.net/projects/markdown/ -.. _Features: http://packages.python.org/Markdown/index.html#Features -.. _`Available Extensions`: http://packages.python.org/Markdown/extensions/index.html +.. _Features: https://pythonhosted.org/Markdown/index.html#Features +.. _`Available Extensions`: https://pythonhosted.org/Markdown/extensions/index.html Support ======= @@ -216,7 +216,7 @@ You may ask for help and discuss various other issues on the setup( name = 'Markdown', version = version, - url = 'http://packages.python.org/Markdown/', + url = 'https://pythonhosted.org/Markdown/', download_url = 'http://pypi.python.org/packages/source/M/Markdown/Markdown-%s.tar.gz' % version, description = 'Python implementation of Markdown.', long_description = long_description, @@ -238,9 +238,9 @@ setup( 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.1', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', 'Topic :: Communications :: Email :: Filters', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries', 'Topic :: Internet :: WWW/HTTP :: Site Management', diff --git a/tests/misc/em-around-links.html b/tests/misc/em-around-links.html index 22e2aba..a7593c5 100644 --- a/tests/misc/em-around-links.html +++ b/tests/misc/em-around-links.html @@ -1,13 +1,13 @@

Title

-

Python in Markdown by some +

Python in Markdown by some great folks - This does work as expected.

\ No newline at end of file diff --git a/tests/misc/em-around-links.txt b/tests/misc/em-around-links.txt index 77dccdb..de04d3b 100644 --- a/tests/misc/em-around-links.txt +++ b/tests/misc/em-around-links.txt @@ -1,14 +1,14 @@ # Title - - *[Python in Markdown](http://packages.python.org/Markdown/) by some + - *[Python in Markdown](https://pythonhosted.org/Markdown/) by some great folks* - This *does* work as expected. - - _[Python in Markdown](http://packages.python.org/Markdown/) by some + - _[Python in Markdown](https://pythonhosted.org/Markdown/) by some great folks_ - This *does* work as expected. - - [_Python in Markdown_](http://packages.python.org/Markdown/) by some + - [_Python in Markdown_](https://pythonhosted.org/Markdown/) by some great folks - This *does* work as expected. - - [_Python in Markdown_](http://packages.python.org/Markdown/) _by some + - [_Python in Markdown_](https://pythonhosted.org/Markdown/) _by some great folks_ - This *does* work as expected. -_[Python in Markdown](http://packages.python.org/Markdown/) by some +_[Python in Markdown](https://pythonhosted.org/Markdown/) by some great folks_ - This *does* work as expected. -- cgit v1.2.3