Skip to content
This repository was archived by the owner on Mar 24, 2021. It is now read-only.

Commit

Permalink
update licensing
Browse files Browse the repository at this point in the history
  • Loading branch information
emmettbutler committed Apr 24, 2015
1 parent 157e4e4 commit 98d6544
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 66 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 2 additions & 3 deletions doc/conf.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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']
3 changes: 2 additions & 1 deletion pykafka/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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."""
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
55 changes: 0 additions & 55 deletions shell.py

This file was deleted.

2 changes: 1 addition & 1 deletion tests/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tests/pykafka/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit 98d6544

Please sign in to comment.