fix prototypes in a few modules, license changes

pkgcore · Feb 5, 2010 · e6a160e · e6a160e
1 parent b7d2cd7
commit e6a160e
Show file tree

Hide file tree

Showing 53 changed files with 432 additions and 396 deletions.
diff --git a/BSD b/BSD
@@ -0,0 +1,26 @@
+Copyright (c) 2008, pkgcore contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the <ORGANIZATION> 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.
diff --git a/COPYING b/COPYING
diff --git a/GPL2 b/GPL2
diff --git a/snakeoil/__init__.py b/snakeoil/__init__.py
@@ -1,4 +1,4 @@
 # Copyright: 2005 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """misc. utility functions"""
diff --git a/snakeoil/caching.py b/snakeoil/caching.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 instance caching metaclass

diff --git a/snakeoil/compatibility.py b/snakeoil/compatibility.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 Compatibility module providing native reimplementations of python2.5 functionality.

diff --git a/snakeoil/containers.py b/snakeoil/containers.py
@@ -1,5 +1,5 @@
 # Copyright: 2005-2009 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 collection of container classes

diff --git a/snakeoil/currying.py b/snakeoil/currying.py
@@ -1,5 +1,5 @@
 # Copyright: 2005 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 Function currying, generating a functor with a set of args/defaults pre bound.

diff --git a/snakeoil/debug_imports.py b/snakeoil/debug_imports.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # Copyright: 2007 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 import __builtin__
 

diff --git a/snakeoil/demandload.py b/snakeoil/demandload.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
-# Copyright: 2007 Marien Zwart <marienz@gentoo.org>
+# Copyright: 2007 Marien Zwart <marienz@gentoo.org>: GPL2/BSD
 # License: GPL2
 
 """Demand load things when used.

diff --git a/snakeoil/dependant_methods.py b/snakeoil/dependant_methods.py
@@ -1,5 +1,5 @@
 # Copyright: 2005-2008 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """Metaclass to inject dependencies into method calls.
 

diff --git a/snakeoil/descriptors.py b/snakeoil/descriptors.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 """Classes implementing the descriptor protocol."""

diff --git a/snakeoil/fileutils.py b/snakeoil/fileutils.py
@@ -1,5 +1,5 @@
 # Copyright: 2005-2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 file related operations, mainly reading

diff --git a/snakeoil/formatters.py b/snakeoil/formatters.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 """Classes wrapping a file-like object to do fancy output on it."""
 

diff --git a/snakeoil/iterables.py b/snakeoil/iterables.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 from collections import deque
 

diff --git a/snakeoil/klass.py b/snakeoil/klass.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 from operator import attrgetter
 from snakeoil.caching import WeakInstMeta

diff --git a/snakeoil/lists.py b/snakeoil/lists.py
@@ -1,5 +1,5 @@
 # Copyright: 2005 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 sequence related operations

diff --git a/snakeoil/mappings.py b/snakeoil/mappings.py
@@ -1,5 +1,5 @@
 # Copyright: 2005-2009 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 miscellanious mapping/dict related classes

diff --git a/snakeoil/modules.py b/snakeoil/modules.py
@@ -1,5 +1,5 @@
 # Copyright: 2005 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 dynamic import functionality

diff --git a/snakeoil/obj.py b/snakeoil/obj.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 from operator import attrgetter
 from snakeoil.currying import pre_curry

diff --git a/snakeoil/osutils/__init__.py b/snakeoil/osutils/__init__.py
@@ -1,6 +1,6 @@
 # Copyright 2004-2007 Brian Harring <ferringb@gmail.com>
 # Copyright 2006 Marien Zwart <marienz@gentoo.org>
-# Distributed under the terms of the GNU General Public License v2
+# License: BSD/GPL2
 
 """
 os specific utilities, FS access mainly

diff --git a/snakeoil/osutils/native_readdir.py b/snakeoil/osutils/native_readdir.py
@@ -1,6 +1,6 @@
 # Copyright: 2006-2007 Brian Harring <ferringb@gmail.com>
 # Copyright: 2006 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 """Wrapper for readdir which grabs file type from d_type."""
 

diff --git a/snakeoil/pickling.py b/snakeoil/pickling.py
@@ -1,5 +1,5 @@
 # Copyright: 2007 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 convenience module using cPickle if available, else failing back to pickle

diff --git a/snakeoil/tar.py b/snakeoil/tar.py
@@ -1,5 +1,5 @@
 # Copyright: 2006-2009 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 tar file access

diff --git a/snakeoil/test/__init__.py b/snakeoil/test/__init__.py
@@ -1,6 +1,6 @@
 # Copyright: 2006-2007 Brian Harring <ferringb@gmail.com>
 # Copyright: 2006 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 """Our unittest extensions."""

diff --git a/snakeoil/test/mixins.py b/snakeoil/test/mixins.py
@@ -1,6 +1,6 @@
 # Copyright: 2005 Marien Zwart <marienz@gentoo.org>
 # Copyright: 2009 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 
 import os
@@ -46,7 +46,7 @@ def mk_named_tempfile(*args, **kwds):
         return io.TextIOWrapper(tmp_f)
 
 # Copyright: 2005 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 import os, stat, errno
 

diff --git a/snakeoil/test/test_caching.py b/snakeoil/test/test_caching.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 from snakeoil.test import TestCase
 from snakeoil import caching

diff --git a/snakeoil/test/test_compatibility.py b/snakeoil/test/test_compatibility.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 from snakeoil.test import TestCase
 from snakeoil import compatibility

diff --git a/snakeoil/test/test_containers.py b/snakeoil/test/test_containers.py
@@ -1,5 +1,5 @@
 # Copyright: 2005 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 from itertools import chain

diff --git a/snakeoil/test/test_currying.py b/snakeoil/test/test_currying.py
@@ -1,5 +1,5 @@
 # Copyright: 2005 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 from snakeoil.test import TestCase
 from snakeoil import currying

diff --git a/snakeoil/test/test_demandload.py b/snakeoil/test/test_demandload.py
@@ -1,5 +1,5 @@
 # Copyright: 2007 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 from snakeoil.test import TestCase

diff --git a/snakeoil/test/test_demandload_usage.py b/snakeoil/test/test_demandload_usage.py
@@ -1,5 +1,5 @@
 # Copyright: 2005-2009 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 import os, stat, errno
 

diff --git a/snakeoil/test/test_dependant_methods.py b/snakeoil/test/test_dependant_methods.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 from snakeoil.test import TestCase
 from snakeoil import dependant_methods as dm

diff --git a/snakeoil/test/test_descriptors.py b/snakeoil/test/test_descriptors.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 from snakeoil.test import TestCase

diff --git a/snakeoil/test/test_fileutils.py b/snakeoil/test/test_fileutils.py
@@ -1,5 +1,5 @@
 # Copyright: 2005 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 import tempfile, os

diff --git a/snakeoil/test/test_formatters.py b/snakeoil/test/test_formatters.py
@@ -1,6 +1,6 @@
 # Copyright: 2007 Brian Harring <ferringb@gmail.com>
 # Copyright: 2006 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 # TODO:
 # for PlainTextFormatter, wouldn't be a bad idea to add a method for testing

diff --git a/snakeoil/test/test_iterables.py b/snakeoil/test/test_iterables.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 import operator
 

diff --git a/snakeoil/test/test_klass.py b/snakeoil/test/test_klass.py
@@ -1,5 +1,5 @@
 # Copyright: 2006-2007 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 from snakeoil.test import TestCase
 from snakeoil import klass, currying

diff --git a/snakeoil/test/test_lists.py b/snakeoil/test/test_lists.py
@@ -1,5 +1,5 @@
 # Copyright: 2005 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 from snakeoil.test import TestCase

diff --git a/snakeoil/test/test_mappings.py b/snakeoil/test/test_mappings.py
@@ -1,6 +1,6 @@
 # Copyright: 2005-2006 Marien Zwart <marienz@gentoo.org>
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 import operator
 

diff --git a/snakeoil/test/test_modules.py b/snakeoil/test/test_modules.py
@@ -1,5 +1,5 @@
 # Copyright: 2005 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 from snakeoil.test import TestCase

diff --git a/snakeoil/test/test_obj.py b/snakeoil/test/test_obj.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 
 import operator

diff --git a/snakeoil/test/test_osutils.py b/snakeoil/test/test_osutils.py
@@ -1,6 +1,6 @@
 # Copyright: 2005-2009 Brian Harring <ferringb@gmail.com>
 # Copyright: 2006 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 import os
 pjoin = os.path.join

diff --git a/snakeoil/test/test_weakrefs.py b/snakeoil/test/test_weakrefs.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 from snakeoil.test import TestCase
 from snakeoil.weakrefs import WeakValCache

diff --git a/snakeoil/version.py b/snakeoil/version.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Marien Zwart <marienz@gentoo.org>
-# License: GPL2
+# License: BSD/GPL2
 
 
 """Version information (tied to bzr)."""

diff --git a/snakeoil/weakrefs.py b/snakeoil/weakrefs.py
@@ -1,5 +1,5 @@
 # Copyright: 2006 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 # Unused import
 # pylint: disable-msg=W0611

diff --git a/snakeoil/xml/__init__.py b/snakeoil/xml/__init__.py
@@ -1,5 +1,5 @@
 # Copyright: 2006-2009 Brian Harring <ferringb@gmail.com>
-# License: GPL2
+# License: BSD/GPL2
 
 """
 indirection to load ElementTree

diff --git a/src/caching.c b/src/caching.c
@@ -1,7 +1,7 @@
 /*
  * Copyright: 2006-2007 Brian Harring <ferringb@gmail.com>
  * Copyright: 2006 Marien Zwart <marienz@gentoo.org>
- * License: GPL2
+ * License: GPL2/BSD
  *
  * C version of some of snakeoil (for extra speed).
  */
@@ -660,7 +660,7 @@ PyDoc_STRVAR(
     "C reimplementation of snakeoil.caching.");
 
 PyMODINIT_FUNC
-init_caching()
+init_caching(void)
 {
     /* Create the module and add the functions */
     PyObject *m = Py_InitModule3(

diff --git a/src/formatters.c b/src/formatters.c
@@ -1,3 +1,9 @@
+/*
+ Copyright: 2007-2010 Charlie Shepherd <masterdriverz@gentoo.org>
+ Copyright: 2009-2010 Brian Harring <ferringb@gmail.com>
+ License: BSD/GPL2
+*/
+
 #include "Python.h"
 #include <snakeoil/common.h>
 #include "structmember.h"
@@ -813,7 +819,7 @@ PyDoc_STRVAR(
     "C implementation of snakeoil.formatters.PlainTextFormatter.\n");
 
 PyMODINIT_FUNC
-init_formatters()
+init_formatters(void)
 {
     PyObject *tmp;
     PyObject *m = Py_InitModule3("_formatters", NULL, formatters_module_doc);