From 98d65447ac92fac46080401799633dd61a2721d6 Mon Sep 17 00:00:00 2001
From: Emmett Butler <emmett.butler321@gmail.com>
Date: Fri, 24 Apr 2015 15:24:26 -0700
Subject: [PATCH] update licensing

---
 LICENSE                         |  2 +-
 doc/conf.py                     |  5 ++-
 pykafka/utils/__init__.py       |  3 +-
 setup.py                        |  6 ++--
 shell.py                        | 55 ---------------------------------
 tests/__init__.py               |  2 +-
 tests/pykafka/utils/__init__.py |  2 +-
 7 files changed, 9 insertions(+), 66 deletions(-)
 delete mode 100644 shell.py

diff --git a/LICENSE b/LICENSE
index 446991f2b..80e49aabd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2012 DISQUS
+Copyright 2015 Parse.ly, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/doc/conf.py b/doc/conf.py
index d3a11f34a..0aeaa45cb 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,5 +1,5 @@
 __license__ = """
-Copyright 2012 DISQUS
+Copyright 2015 Parse.ly, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -40,5 +40,4 @@
 pygments_style = 'sphinx'
 htmlhelp_basename = 'pykafkadoc'
 
-autodoc_default_flags = ['special-members', 'undoc-members', 'private-members',
-                         'show-inheritance']
+autodoc_default_flags = ['special-members', 'private-members', 'show-inheritance']
diff --git a/pykafka/utils/__init__.py b/pykafka/utils/__init__.py
index 8eee3b9df..ca6997ae7 100644
--- a/pykafka/utils/__init__.py
+++ b/pykafka/utils/__init__.py
@@ -1,5 +1,5 @@
 __license__ = """
-Copyright 2012 DISQUS
+Copyright 2015 Parse.ly, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 limitations under the License.
 """
 
+
 class Serializable(object):
     def __len__(self):
         """Length of the bytes that will be sent to the Kafka server."""
diff --git a/setup.py b/setup.py
index 69bc96090..3be121b47 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-"""
-Copyright 2012 DISQUS
-Copyright 2013 Parse.ly, Inc.
+__license__ = """
+Copyright 2015 Parse.ly, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,7 +14,6 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-
 import sys
 
 from setuptools import setup, find_packages
diff --git a/shell.py b/shell.py
deleted file mode 100644
index bdd560cea..000000000
--- a/shell.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-Copyright 2012 DISQUS
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-#!/usr/bin/env python
-import code
-import logging
-from optparse import OptionParser
-
-from kazoo.client import KazooClient
-
-from kafka.cluster import Cluster
-
-parser = OptionParser()
-parser.add_option('--zookeeper', help='zookeeper hosts', default=None)
-parser.add_option('--log-level', dest='loglevel', help='log level', default='DEBUG')
-
-options, args = parser.parse_args()
-
-zookeeper_kwargs = {}
-if options.zookeeper is not None:
-    zookeeper_kwargs['hosts'] = options.zookeeper
-
-logger = logging.getLogger()
-logger.setLevel(getattr(logging, options.loglevel.upper()))
-logger.addHandler(logging.StreamHandler())
-
-zookeeper = KazooClient(**zookeeper_kwargs)
-zookeeper.connect()
-
-kafka = Cluster(zookeeper)
-
-exposed = {
-    'kafka': kafka,
-    'zookeeper': zookeeper,
-}
-
-banner = """---
-Welcome to PyKafka! We've provided some local variables for you:
-%s
----""" % '\n'.join('> %s: %s' % (key, repr(value)) for key, value in exposed.iteritems())
-
-code.interact(banner, local=exposed)
diff --git a/tests/__init__.py b/tests/__init__.py
index 37af84db7..528c9e324 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
 __license__ = """
-Copyright 2012 DISQUS
+Copyright 2015 Parse.ly, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/pykafka/utils/__init__.py b/tests/pykafka/utils/__init__.py
index 37af84db7..528c9e324 100644
--- a/tests/pykafka/utils/__init__.py
+++ b/tests/pykafka/utils/__init__.py
@@ -1,5 +1,5 @@
 __license__ = """
-Copyright 2012 DISQUS
+Copyright 2015 Parse.ly, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.