From d888f0d24d32dbdc0314172e105ce07ae11136c0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 14 Jul 2012 19:47:15 +0000 Subject: [PATCH] Set eol type to native git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wx/lib/pubsub/README_WxPython.txt | 34 +++++++++++++------------- wx/lib/pubsub/RELEASE_NOTES.txt | 18 +++++++------- wx/lib/pubsub/pubsub1/sphinx.py | 40 +++++++++++++++---------------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/wx/lib/pubsub/README_WxPython.txt b/wx/lib/pubsub/README_WxPython.txt index 08cfc0eb..fe71b72a 100644 --- a/wx/lib/pubsub/README_WxPython.txt +++ b/wx/lib/pubsub/README_WxPython.txt @@ -1,17 +1,17 @@ -For wxPython users: - -The code in this wx/lib/pubsub folder is taken verbatim from the PyPubSub -project on SourceForge.net. Pubsub originated as a wxPython lib, but it is now -a standalone project on SourceForge. It is included as part of your wxPython -installation for convenience to wxPython users and for backward compatiblity. - -The source distribution on SF.net tends to be updated more often. If you wish to -install pubsub standalone you can follow the instructions at -http://pubsub.sourceforge.net/installation.html. - -The documentation for pubsub is at http://pubsub.sourceforge.net, and some examples -are in wx/lib/pubsub/examples. There are also a couple pages on the WxPython wiki -that discuss usage of pubsub in wxPython. - -Oliver Schoenborn -Dec 2011 +For wxPython users: + +The code in this wx/lib/pubsub folder is taken verbatim from the PyPubSub +project on SourceForge.net. Pubsub originated as a wxPython lib, but it is now +a standalone project on SourceForge. It is included as part of your wxPython +installation for convenience to wxPython users and for backward compatiblity. + +The source distribution on SF.net tends to be updated more often. If you wish to +install pubsub standalone you can follow the instructions at +http://pubsub.sourceforge.net/installation.html. + +The documentation for pubsub is at http://pubsub.sourceforge.net, and some examples +are in wx/lib/pubsub/examples. There are also a couple pages on the WxPython wiki +that discuss usage of pubsub in wxPython. + +Oliver Schoenborn +Dec 2011 diff --git a/wx/lib/pubsub/RELEASE_NOTES.txt b/wx/lib/pubsub/RELEASE_NOTES.txt index 51d4214b..3f1365f0 100644 --- a/wx/lib/pubsub/RELEASE_NOTES.txt +++ b/wx/lib/pubsub/RELEASE_NOTES.txt @@ -1,9 +1,9 @@ -Release Notes: PyPubSub 3.1.2 - -This is a minor release for small improvements made (see docs/CHANGELOG.txt) -based on feedback from user community. Also extended the documentation. See -pubsub.sourceforge.net for installation and usage. See the examples folder for -some useful examples. - -Oliver Schoenborn -Nov 2011 \ No newline at end of file +Release Notes: PyPubSub 3.1.2 + +This is a minor release for small improvements made (see docs/CHANGELOG.txt) +based on feedback from user community. Also extended the documentation. See +pubsub.sourceforge.net for installation and usage. See the examples folder for +some useful examples. + +Oliver Schoenborn +Nov 2011 diff --git a/wx/lib/pubsub/pubsub1/sphinx.py b/wx/lib/pubsub/pubsub1/sphinx.py index 7a8ecf16..093f1df9 100644 --- a/wx/lib/pubsub/pubsub1/sphinx.py +++ b/wx/lib/pubsub/pubsub1/sphinx.py @@ -1,20 +1,20 @@ -''' -Sphinx autodoc requires direct import of pubsub.pubsub1.pub. -But in that case, the pub module no longer has access to -sibbling modules from pubsub package. By adding ".." to -sys.path, "import something" in pubsub1/pub.py find the -module in pubsub and sphinx autodoc works as expected. - -This module should be used from sphinx's conf.py. -''' - -# add the parent folder to sys.path because Sphinx needs to import -# pubsub1 as a module rather than via the mechanism built into pubsub -# module. -import sys, os -sphinxExtPath = os.path.normpath( - os.path.join( - os.path.dirname(__file__), - '..') - ) -sys.path.append( sphinxExtPath ) +''' +Sphinx autodoc requires direct import of pubsub.pubsub1.pub. +But in that case, the pub module no longer has access to +sibbling modules from pubsub package. By adding ".." to +sys.path, "import something" in pubsub1/pub.py find the +module in pubsub and sphinx autodoc works as expected. + +This module should be used from sphinx's conf.py. +''' + +# add the parent folder to sys.path because Sphinx needs to import +# pubsub1 as a module rather than via the mechanism built into pubsub +# module. +import sys, os +sphinxExtPath = os.path.normpath( + os.path.join( + os.path.dirname(__file__), + '..') + ) +sys.path.append( sphinxExtPath )