Skip to content
Browse files

relicense non-core code under 3-clause New BSD

Add CONTRIBUTING file describing current license policy

All authors on changed files have been contacted, and consent given.

Summary of current license:

zmq.core: LGPL (permanent)
perf: LGPL (permanent, © iMatix)
zmq.devices.monitoredqueue.pxd: LGPL (permanent, adapted from libzmq code)
zmq.ssh.forward: LGPL (permanent, © paramiko)
zmq.eventloop: Apache (permanent, © Facebook)
examples/chat: LGPL (pending author response)
examples/devices: LGPL (pending author response)

Everything else: 3-Clause New BSD
  • Loading branch information...
1 parent 8e1b9e0 commit b95d3ee5bd401ef17f259e3eae27a3f5694016be @minrk minrk committed Mar 5, 2012
Showing with 349 additions and 659 deletions.
  1. +42 −0 CONTRIBUTING.md
  2. +8 −18 buildutils.py
  3. +3 −0 examples/LICENSE
  4. +5 −18 examples/mongodb/client.py
  5. +5 −18 examples/mongodb/controller.py
  6. +5 −16 examples/poll/pair.py
  7. +5 −16 examples/poll/pubsub.py
  8. +5 −16 examples/poll/reqrep.py
  9. +5 −16 examples/pubsub/publisher.py
  10. +5 −16 examples/pubsub/subscriber.py
  11. +5 −16 examples/pubsub/topics_pub.py
  12. +5 −16 examples/pubsub/topics_sub.py
  13. +2 −2 examples/web/backend.py
  14. +2 −2 examples/web/backend_stream.py
  15. +2 −2 examples/web/frontend.py
  16. +2 −2 examples/web/frontend_stream.py
  17. +8 −0 perf/patch_for_2.5.py
  18. +12 −21 setup.py
  19. +7 −16 zmq/__init__.py
  20. +6 −16 zmq/devices/__init__.py
  21. +6 −16 zmq/devices/basedevice.py
  22. +2 −1 zmq/devices/monitoredqueue.pxd
  23. +6 −16 zmq/devices/monitoredqueue.pyx
  24. +6 −16 zmq/devices/monitoredqueuedevice.py
  25. +6 −16 zmq/log/handlers.py
  26. +2 −0 zmq/ssh/forward.py
  27. +6 −16 zmq/tests/__init__.py
  28. +6 −16 zmq/tests/test_context.py
  29. +6 −16 zmq/tests/test_device.py
  30. +6 −16 zmq/tests/test_error.py
  31. +6 −16 zmq/tests/test_imports.py
  32. +6 −16 zmq/tests/test_ioloop.py
  33. +6 −16 zmq/tests/test_log.py
  34. +6 −16 zmq/tests/test_message.py
  35. +6 −16 zmq/tests/test_monqueue.py
  36. +6 −16 zmq/tests/test_multipart.py
  37. +6 −16 zmq/tests/test_pair.py
  38. +6 −16 zmq/tests/test_poll.py
  39. +6 −16 zmq/tests/test_pubsub.py
  40. +6 −16 zmq/tests/test_reqrep.py
  41. +6 −16 zmq/tests/test_socket.py
  42. +6 −16 zmq/tests/test_stopwatch.py
  43. +6 −16 zmq/tests/test_version.py
  44. +6 −16 zmq/tests/test_web.py
  45. +6 −16 zmq/tests/test_zmqstream.py
  46. +18 −9 zmq/utils/buffers.pxd
  47. +5 −17 zmq/utils/initthreads.pyx
  48. +6 −16 zmq/utils/jsonapi.py
  49. +9 −0 zmq/utils/rebuffer.pyx
  50. +6 −16 zmq/utils/strtypes.py
  51. +7 −0 zmq/utils/zmq_compat.h
  52. +4 −2 zmq/web/proxy.py
  53. +4 −2 zmq/web/zmqweb.py
  54. +9 −1 zmqversion.py
View
42 CONTRIBUTING.md
@@ -0,0 +1,42 @@
+# Licensing and contributing to PyZMQ
+
+PyZMQ uses different licenses for different parts of the code.
+
+The 'core' of PyZMQ (located in zmq/core) is licensed under LGPLv3. This just
+means that if you make any changes to how that code works, you must release
+those changes under the LGPL. If you just *use* pyzmq, then you can use any
+license you want for your own code.
+
+We don't feel that the restrictions imposed by the LGPL make sense for the
+'non-core' functionality in pyzmq (derivative code must *also* be LGPL or GPL),
+especially for examples and utility code, so we have relicensed all 'non-core'
+code under the more permissive BSD (specifically Modified BSD aka New BSD aka
+3-clause BSD), where possible. This means that you can copy this code and build
+your own apps without needing to license your own code with the LGPL or GPL.
+
+## Your contributions
+
+When you contribute to PyZMQ, your contributions are made under the same
+license as the file you are working on. Any new original code should be BSD
+licensed.
+
+Examples are copyright their respective authors, and BSD unless otherwise
+specified by the author. You can LGPL (or GPL or MIT or Apache, etc.) your own new
+examples if you like, but we strongly encourage using the default BSD license.
+
+## Inherited licenses in pyzmq
+
+Some code outside the core is taken from other open-source projects, and
+inherits that project's license.
+
+* zmq/eventloop contains files inherited and adapted from [tornado][], and inherits the Apache license
+
+* zmq/ssh/forward.py is from [paramiko][], and inherits LGPL
+
+* zmq/devices/monitoredqueue.pxd is derived from the zmq_device function in
+libzmq, and inherits LGPL
+
+* perf examples are (c) iMatix, and LGPL
+
+[tornado]: http://www.tornadoweb.org
+[paramiko]: http://www.lag.net/paramiko
View
26 buildutils.py
@@ -1,25 +1,15 @@
"""Detect zmq version"""
+#-----------------------------------------------------------------------------
+# Copyright (C) 2011 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2011 Min Ragan-Kelley
-#
-# This file is part of pyzmq, copied and adapted from h5py.
-# h5py source used under the New BSD license
-#
-# h5py: <http://code.google.com/p/h5py/>
-# BSD license: <http://www.opensource.org/licenses/bsd-license.php>
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
+# This file is part of pyzmq, copied and adapted from h5py.
+# h5py source used under the New BSD license
#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
+# h5py: <http://code.google.com/p/h5py/>
#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import shutil
import sys
View
3 examples/LICENSE
@@ -0,0 +1,3 @@
+PyZMQ examples are copyright their respective authors, and licensed
+under the New BSD License as described in COPYING.BSD unless otherwise
+specified in the file.
View
23 examples/mongodb/client.py
@@ -1,22 +1,9 @@
-#!/usr/bin/env python
-
-#
-# Copyright (c) 2010 Justin Riley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Justin Riley
#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import json
import zmq
View
23 examples/mongodb/controller.py
@@ -1,22 +1,9 @@
-#!/usr/bin/env python
-
-#
-# Copyright (c) 2010 Justin Riley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Justin Riley
#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import sys
import zmq
View
21 examples/poll/pair.py
@@ -1,22 +1,11 @@
"""A thorough test of polling PAIR sockets."""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger
#
-# Copyright (c) 2010 Brian E. Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import time
import zmq
View
21 examples/poll/pubsub.py
@@ -1,22 +1,11 @@
"""A thorough test of polling PUB/SUB sockets."""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger
#
-# Copyright (c) 2010 Brian E. Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import time
import zmq
View
21 examples/poll/reqrep.py
@@ -1,22 +1,11 @@
"""A thorough test of polling REQ/REP sockets."""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger
#
-# Copyright (c) 2010 Brian E. Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import time
import zmq
View
21 examples/pubsub/publisher.py
@@ -5,23 +5,12 @@
use a REQ/REP side channel to synchronize the two processes at the beginning.
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger
#
-# Copyright (c) 2010 Brian E. Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import sys
import time
View
21 examples/pubsub/subscriber.py
@@ -5,23 +5,12 @@
use a REQ/REP side channel to synchronize the two processes at the beginning.
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger
#
-# Copyright (c) 2010 Brian E. Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import sys
View
21 examples/pubsub/topics_pub.py
@@ -10,23 +10,12 @@
catch 'weather'.
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger
#
-# Copyright (c) 2010 Brian E. Granger, Fernando Perez
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import itertools
import sys
View
21 examples/pubsub/topics_sub.py
@@ -10,23 +10,12 @@
catch 'weather'.
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger, Fernando Perez
#
-# Copyright (c) 2010 Brian E. Granger, Fernando Perez
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import sys
import time
View
4 examples/web/backend.py
@@ -14,9 +14,9 @@
"""
#-----------------------------------------------------------------------------
-# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+# Copyright (c) 2012 Brian Granger, Min Ragan-Kelley
#
-# Distributed under the terms of the BSD License. The full license is in
+# Distributed under the terms of the New BSD License. The full license is in
# the file COPYING.BSD, distributed as part of this software.
#-----------------------------------------------------------------------------
View
4 examples/web/backend_stream.py
@@ -18,9 +18,9 @@
"""
#-----------------------------------------------------------------------------
-# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+# Copyright (c) 2012 Brian Granger, Min Ragan-Kelley
#
-# Distributed under the terms of the BSD License. The full license is in
+# Distributed under the terms of the New BSD License. The full license is in
# the file COPYING.BSD, distributed as part of this software.
#-----------------------------------------------------------------------------
View
4 examples/web/frontend.py
@@ -18,9 +18,9 @@
"""
#-----------------------------------------------------------------------------
-# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+# Copyright (c) 2012 Brian Granger, Min Ragan-Kelley
#
-# Distributed under the terms of the BSD License. The full license is in
+# Distributed under the terms of the New BSD License. The full license is in
# the file COPYING.BSD, distributed as part of this software.
#-----------------------------------------------------------------------------
View
4 examples/web/frontend_stream.py
@@ -24,9 +24,9 @@
"""
#-----------------------------------------------------------------------------
-# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+# Copyright (c) 2012 Brian Granger, Min Ragan-Kelley
#
-# Distributed under the terms of the BSD License. The full license is in
+# Distributed under the terms of the New BSD License. The full license is in
# the file COPYING.BSD, distributed as part of this software.
#-----------------------------------------------------------------------------
View
8 perf/patch_for_2.5.py
@@ -2,6 +2,14 @@
This just replaces the handful of b'msg' instances with 'msg'.
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2011-2012 Brian Granger, Min Ragan-Kelley
+#
+# This file is part of pyzmq
+#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
for prefix in ('local', 'remote'):
for test in ('lat', 'thr'):
View
33 setup.py
@@ -1,29 +1,19 @@
#!/usr/bin/env python
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Brian E. Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
-# The `configure` subcommand is copied and adaped from h5py
-# h5py source used under the New BSD license
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
#
-# h5py: <http://code.google.com/p/h5py/>
-# BSD license: <http://www.opensource.org/licenses/bsd-license.php>
+# The `configure` subcommand is copied and adaped from h5py
+# h5py source used under the New BSD license
#
+# h5py: <http://code.google.com/p/h5py/>
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
@@ -649,7 +639,7 @@ def find_packages():
download_url = 'http://github.com/zeromq/pyzmq/downloads',
description = "Python bindings for 0MQ.",
long_description = long_desc,
- license = "LGPL",
+ license = "LGPL+BSD",
cmdclass = cmdclass,
classifiers = [
'Development Status :: 5 - Production/Stable',
@@ -658,6 +648,7 @@ def find_packages():
'Intended Audience :: Science/Research',
'Intended Audience :: System Administrators',
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+ 'License :: OSI Approved :: BSD License',
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX',
View
23 zmq/__init__.py
@@ -1,23 +1,14 @@
"""Python bindings for 0MQ."""
+#-----------------------------------------------------------------------------
+# Copyright (C) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/devices/__init__.py
@@ -1,23 +1,13 @@
"""0MQ Device classes for running in background threads or processes."""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/devices/basedevice.py
@@ -6,24 +6,14 @@
* Brian Granger
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley, Brian Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
3 zmq/devices/monitoredqueue.pxd
@@ -9,7 +9,8 @@ Authors
#
# Copyright (c) 2010 Min Ragan-Kelley, Brian Granger
#
-# This file is part of pyzmq.
+# This file is part of pyzmq, but is derived and adapted from zmq_queue.cpp
+# originally from libzmq-2.1.6, used under LGPLv3
#
# pyzmq is free software; you can redistribute it and/or modify it under
# the terms of the Lesser GNU General Public License as published by
View
22 zmq/devices/monitoredqueue.pyx
@@ -6,24 +6,14 @@ Authors
* Brian Granger
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley, Brian Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/devices/monitoredqueuedevice.py
@@ -6,24 +6,14 @@
* Brian Granger
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley, Brian Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/log/handlers.py
@@ -23,24 +23,14 @@
* Min RK
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
2 zmq/ssh/forward.py
@@ -1,3 +1,4 @@
+#------------------------------------------------------------------------------
#
# This file is adapted from a paramiko demo, and thus licensed under LGPL 2.1.
# Original Copyright (C) 2003-2007 Robey Pointer <robeypointer@gmail.com>
@@ -16,6 +17,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with Paramiko; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA.
+#------------------------------------------------------------------------------
"""
Sample script showing how to do local port forwarding over paramiko.
View
22 zmq/tests/__init__.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_context.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_device.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_error.py
@@ -1,22 +1,12 @@
# -*- coding: utf8 -*-
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2011 Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_imports.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_ioloop.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_log.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_message.py
@@ -1,22 +1,12 @@
# -*- coding: utf8 -*-
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_monqueue.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_multipart.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_pair.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_poll.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_pubsub.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_reqrep.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_socket.py
@@ -1,22 +1,12 @@
# -*- coding: utf8 -*-
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_stopwatch.py
@@ -1,22 +1,12 @@
# -*- coding: utf8 -*-
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2011 Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_version.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2011 Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_web.py
@@ -1,21 +1,11 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2012 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/tests/test_zmqstream.py
@@ -1,22 +1,12 @@
# -*- coding: utf8 -*-
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2011 Brian Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
27 zmq/utils/buffers.pxd
@@ -1,21 +1,30 @@
"""Python version-independent methods for C/Python buffers.
-This module was copied and dapted from mpi4py:
-
-Jul 23, 2010 18:00 PST (r539)
-http://code.google.com/p/mpi4py/source/browse/trunk/src/MPI/asbuffer.pxi
-Copyright (c) 2009, Lisandro Dalcin.
-All rights reserved.
-BSD License: http://www.opensource.org/licenses/bsd-license.php
-
-Code not from mpi4py:
+This file was copied and adapted from mpi4py.
Authors
-------
* MinRK
"""
#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Lisandro Dalcin
+# All rights reserved.
+# Used under BSD License: http://www.opensource.org/licenses/bsd-license.php
+#
+# Retrieval:
+# Jul 23, 2010 18:00 PST (r539)
+# http://code.google.com/p/mpi4py/source/browse/trunk/src/MPI/asbuffer.pxi
+#
+# Modifications from original:
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
+#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
+
+#-----------------------------------------------------------------------------
# Python includes.
#-----------------------------------------------------------------------------
View
22 zmq/utils/initthreads.pyx
@@ -1,23 +1,11 @@
"""Utility to initialize threads."""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
22 zmq/utils/jsonapi.py
@@ -12,24 +12,14 @@
* Brian Granger
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley, Brian Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
View
9 zmq/utils/rebuffer.pyx
@@ -8,6 +8,15 @@ Authors
* MinRK
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
+#
+# This file is part of pyzmq
+#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
from libc.stdlib cimport malloc
from buffers cimport *
View
22 zmq/utils/strtypes.py
@@ -5,24 +5,14 @@
* MinRK
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2010 Min Ragan-Kelley, Brian Granger
-#
-# This file is part of pyzmq.
-#
-# pyzmq is free software; you can redistribute it and/or modify it under
-# the terms of the Lesser GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyzmq is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Lesser GNU General Public License for more details.
-#
-# You should have received a copy of the Lesser GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of pyzmq
#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import sys
View
7 zmq/utils/zmq_compat.h
@@ -1,3 +1,10 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2010-2012 Brian Granger, Min Ragan-Kelley
+//
+// Distributed under the terms of the New BSD License. The full license is in
+// the file COPYING.BSD, distributed as part of this software.
+//-----------------------------------------------------------------------------
+
#if defined(_MSC_VER)
#define pyzmq_int64_t __int64
#else
View
6 zmq/web/proxy.py
@@ -12,9 +12,11 @@
"""
#-----------------------------------------------------------------------------
-# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+# Copyright (c) 2012 Brian Granger, Min Ragan-Kelley
#
-# Distributed under the terms of the BSD License. The full license is in
+# This file is part of pyzmq
+#
+# Distributed under the terms of the New BSD License. The full license is in
# the file COPYING.BSD, distributed as part of this software.
#-----------------------------------------------------------------------------
View
6 zmq/web/zmqweb.py
@@ -9,9 +9,11 @@
"""
#-----------------------------------------------------------------------------
-# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+# Copyright (c) 2012 Brian Granger, Min Ragan-Kelley
#
-# Distributed under the terms of the BSD License. The full license is in
+# This file is part of pyzmq
+#
+# Distributed under the terms of the New BSD License. The full license is in
# the file COPYING.BSD, distributed as part of this software.
#-----------------------------------------------------------------------------
View
10 zmqversion.py
@@ -1,9 +1,17 @@
-#!/usr/bin/env python
"""A simply script to scrape zmq.h for the zeromq version.
This is similar to the version.sh script in a zeromq source dir, but
it searches for an installed header, rather than in the current dir.
"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2011 Brian Granger, Min Ragan-Kelley
+#
+# This file is part of pyzmq
+#
+# Distributed under the terms of the New BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
from __future__ import with_statement
import os

0 comments on commit b95d3ee

Please sign in to comment.
Something went wrong with that request. Please try again.