FIX: wheel builds again

FIX: tox runs again
FIX: docs updated and build with latest sphinx

.gitignore

@@ -0,0 +1 @@
+__pycache__

MANIFEST.in

@@ -1 +1 @@
-include ez_setup.py
+

README.txt

@@ -4,23 +4,10 @@ receiving messages between objects of an application, as well as a variety of
 advanced features that facilitate debugging and maintaining topics and messages
 in larger applications. 
 
-Install with "pip install pypubsub" or "easy_install pypubsub".
+Install with "pip install pypubsub".
 
-Latest stable version, 3.3.0:
-
-* `Zip (source)       <http://downloads.sf.net/project/pubsub/pubsub/3.3.0/PyPubSub-3.3.0.zip>`_
-* `Windows Installer  <http://downloads.sf.net/project/pubsub/pubsub/3.3.0/PyPubSub-3.3.0.win32.exe>`_
-* `Egg for Python 2.7 <http://downloads.sf.net/project/pubsub/pubsub/3.3.0/PyPubSub-3.3.0-py2.7.egg>`_
-* `Egg for Python 3.3 <http://downloads.sf.net/project/pubsub/pubsub/3.3.0/PyPubSub-3.3.0-py3.3.egg>`_
-
-Release candidate version, 3.4: 
-
-* Not yet available
-
-Note: All downloads are hosted on SourceForge. See the `Files pages on SF.net 
+Older downloads are on pypi.python.org. hosted on SourceForge. See the `Files pages on SF.net
 <http://downloads.sf.net/project/pubsub/pubsub>`_ for additional downloads, 
 older releases, and download stats (the ones on PyPi page are specific to PyPi). 
 
-See the `release notes <https://sourceforge.net/p/pubsub/code/HEAD/tree/trunk/src/pubsub/RELEASE_NOTES.txt>`_ 
-for additional information on this and other releases. 
 

README_WxPython.txt

@@ -2,13 +2,21 @@
 
 For wxPython users: 
 
-The code in wx/lib/pubsub folder was originally part of the wxPython source base, 
-but was eventually moved into its own project, PyPubSub, hosted on SourceForge. 
-The code in that folder is now taken from the repository on SourceForge. It is 
-included as part of wxPython distribution for convenience to wxPython users, but 
-pubsub can also be installed standalone (see installation notes at http://pypubsub.sourceforge.net). The PyPubSub website also has extensive documentation.
+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 wxPython
+distribution for convenience to wxPython users, but pubsub can also be installed
+standalone (see installation notes at http://pypubsub.sourceforge.net), or you
+can also overwrite the version in this folder with the standalone version or
+put an SVN checkout of pubsub in this folder, etc.
 
-The WxPython wiki also discusses usage of pubsub in wxPython, but some of the code is date. 
+Note that the source distribution on SF.net tends to be updated more often than
+the copy in wx/lib/pubsub. If you wish to install pubsub standalone, there are
+instructions on the Install page of http://pypubsub.sourceforge.net.
+
+There is extensive documentation for pubsub at http://pypubsub.sourceforge.net,
+and some examples are in wx/lib/pubsub/examples. The WxPython wiki also discusses
+usage of pubsub in wxPython.
 
 Oliver Schoenborn
-December 2016
+December 2013

docs/changelog.rst

@@ -3,6 +3,16 @@ Changelog
 
 High-level changelog. For details, consult the SVN logs.
 
+:4.0.0 (Sep 2016):
+
+* Update for Python 3.5
+* Abandon support for Python 2.x, easy_install, and arg1 protocol
+* Use PEP 484 style of annotations throughout
+* Use enum when possible
+* Added currying of subscribed listener args
+* (but otherwise no changes in performance or behavior)
+
+
 :3.3.0 (Nov 2013):
 
 * cleanup low-level API: exception classes, moved some out of pub module that did not

docs/development/py2exe.rst

@@ -81,11 +81,6 @@ The ``setup.py`` for this would look something like this
 
 .. literalinclude:: setup-cxfreeze.py
 
-The packages option slightly differs for *cx_Freeze*: we have to
-explicitly include the sub packages ``pubsub.core.kwargs`` and
-``pubsub.core.arg1`` so that all the modules under them get included
-for packaging.
-
 To build, run::
 
    python setup.py build
@@ -99,8 +94,4 @@ We can safely ignore the missing modules warning in the build log::
    ? topicargspecimpl imported from pubsub.core.topicargspec
    ? topicmgrimpl imported from pubsub.core.topicmgr
 
-All these modules are under ``pubsub.core.kwargs`` and
-``pubsub.core.arg1``. In *cx_Freeze* dependent modules are gathered from
-the import statements recursively, during this it reports that it
-can't find the above modules. But as we have included them directly in
-the packages option these modules are included for packaging.
+

docs/development/setup-cxfreeze.py

@@ -11,7 +11,6 @@
 
 opts = { 'compressed' : True,
          'create_shared_zip' : False,
-         'packages' : ['pubsub.core.kwargs', 'pubsub.core.arg1'],
          }
 
 WIN_Target = cxExecutable(

docs/usage/core_classes.rst

@@ -13,9 +13,6 @@ default Publisher, which contains a TopicManager, which generates a Topic object
 for every topic used. The Publisher instance returns a Listener instance from subscribe, 
 wrapping the given callable with pubsub-relevant meta-data about the callable. 
 
-.. note:: The following subsections provide the documentation for those classes 
-    when the kwargs messaging protocol is used (the default). When arg1 is used, 
-    the replace any ``**kwargs`` by ``data``.
 
 Publisher
 -----------