Permalink
Browse files

Updating license of zmqweb to BSD.

  • Loading branch information...
1 parent 03499ff commit 2f0bf6a443ddd881eeee8ac53bb17bcd40d63846 @ellisonbg ellisonbg committed Mar 1, 2012
Showing with 67 additions and 36 deletions.
  1. +32 −0 COPYING.BSD
  2. +7 −0 examples/web/backend.py
  3. +8 −2 examples/web/backend_stream.py
  4. +7 −0 examples/web/frontend.py
  5. +7 −0 examples/web/frontend_stream.py
  6. +3 −17 zmq/web/proxy.py
  7. +3 −17 zmq/web/zmqweb.py
View
@@ -0,0 +1,32 @@
+PyZMQ is licensed under the terms of the Modified BSD License (also known as
+New or Revised BSD), as follows:
+
+Copyright (c) 2009-2012, Brian Granger, Min Ragan-Kelley
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+Neither the name of PyZMQ nor the names of its contributors may be used to
+endorse or promote products derived from this software without specific prior
+written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
@@ -13,6 +13,13 @@
"""
+#-----------------------------------------------------------------------------
+# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+#
+# Distributed under the terms of the BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
import logging
logging.basicConfig(level=logging.DEBUG)
import time
@@ -15,8 +15,14 @@
* Hit the URLs http://127.0.0.1/foo and http://127.0.0.1/foo/sleep?t=1. The
t parameter of this last URL can be changed to something greater than 10 to
observe the timeout behavior.
-
-"""
+ """
+
+#-----------------------------------------------------------------------------
+# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+#
+# Distributed under the terms of the BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
import logging
logging.basicConfig(level=logging.DEBUG)
View
@@ -17,6 +17,13 @@
* Brian Granger
"""
+#-----------------------------------------------------------------------------
+# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+#
+# Distributed under the terms of the BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
import logging
logging.basicConfig(level=logging.DEBUG)
@@ -23,6 +23,13 @@
* Brian Granger
"""
+#-----------------------------------------------------------------------------
+# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
+#
+# Distributed under the terms of the BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
import logging
logging.basicConfig(level=logging.DEBUG)
View
@@ -12,24 +12,10 @@
"""
#-----------------------------------------------------------------------------
+# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2012 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/>.
-#
+# Distributed under the terms of the BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
View
@@ -9,24 +9,10 @@
"""
#-----------------------------------------------------------------------------
+# Copyright (C) 2012. Brian Granger, Min Ragan-Kelley
#
-# Copyright (c) 2012 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/>.
-#
+# Distributed under the terms of the BSD License. The full license is in
+# the file COPYING.BSD, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------

0 comments on commit 2f0bf6a

Please sign in to comment.