From e6a160efbcc5393f16613631820c58377c5bb864 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Fri, 5 Feb 2010 12:01:53 -0800 Subject: [PATCH] fix prototypes in a few modules, license changes --- BSD | 26 ++ COPYING | 344 +----------------------- GPL2 | 340 +++++++++++++++++++++++ snakeoil/__init__.py | 2 +- snakeoil/caching.py | 2 +- snakeoil/compatibility.py | 2 +- snakeoil/containers.py | 2 +- snakeoil/currying.py | 2 +- snakeoil/debug_imports.py | 2 +- snakeoil/demandload.py | 2 +- snakeoil/dependant_methods.py | 2 +- snakeoil/descriptors.py | 2 +- snakeoil/fileutils.py | 2 +- snakeoil/formatters.py | 2 +- snakeoil/iterables.py | 2 +- snakeoil/klass.py | 2 +- snakeoil/lists.py | 2 +- snakeoil/mappings.py | 2 +- snakeoil/modules.py | 2 +- snakeoil/obj.py | 2 +- snakeoil/osutils/__init__.py | 2 +- snakeoil/osutils/native_readdir.py | 2 +- snakeoil/pickling.py | 2 +- snakeoil/tar.py | 2 +- snakeoil/test/__init__.py | 2 +- snakeoil/test/mixins.py | 4 +- snakeoil/test/test_caching.py | 2 +- snakeoil/test/test_compatibility.py | 2 +- snakeoil/test/test_containers.py | 2 +- snakeoil/test/test_currying.py | 2 +- snakeoil/test/test_demandload.py | 2 +- snakeoil/test/test_demandload_usage.py | 2 +- snakeoil/test/test_dependant_methods.py | 2 +- snakeoil/test/test_descriptors.py | 2 +- snakeoil/test/test_fileutils.py | 2 +- snakeoil/test/test_formatters.py | 2 +- snakeoil/test/test_iterables.py | 2 +- snakeoil/test/test_klass.py | 2 +- snakeoil/test/test_lists.py | 2 +- snakeoil/test/test_mappings.py | 2 +- snakeoil/test/test_modules.py | 2 +- snakeoil/test/test_obj.py | 2 +- snakeoil/test/test_osutils.py | 2 +- snakeoil/test/test_weakrefs.py | 2 +- snakeoil/version.py | 2 +- snakeoil/weakrefs.py | 2 +- snakeoil/xml/__init__.py | 2 +- src/caching.c | 4 +- src/formatters.c | 8 +- src/klass.c | 4 +- src/lists.c | 4 +- src/posix.c | 4 +- src/readdir.c | 4 +- 53 files changed, 432 insertions(+), 396 deletions(-) create mode 100644 BSD create mode 100644 GPL2 diff --git a/BSD b/BSD new file mode 100644 index 00000000..b79aa809 --- /dev/null +++ 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 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 index d60c31a9..75079e8b 100644 --- a/COPYING +++ b/COPYING @@ -1,340 +1,4 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. +snakeoil is available under BSD 3 clause (see BSD file adjacent to this file) or GPL2 with the following exemptions- +snakeoil/demandload.py is GPL2 only +snakeoil/fix_copy.py is GPL2 only +src/compatibility.py is PSF-2.2 or GPL2 (this file is only used on python2.4) diff --git a/GPL2 b/GPL2 new file mode 100644 index 00000000..d60c31a9 --- /dev/null +++ b/GPL2 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/snakeoil/__init__.py b/snakeoil/__init__.py index 9ff5a094..c4dd6087 100644 --- a/snakeoil/__init__.py +++ b/snakeoil/__init__.py @@ -1,4 +1,4 @@ # Copyright: 2005 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """misc. utility functions""" diff --git a/snakeoil/caching.py b/snakeoil/caching.py index 75a860f7..38083927 100644 --- a/snakeoil/caching.py +++ b/snakeoil/caching.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ instance caching metaclass diff --git a/snakeoil/compatibility.py b/snakeoil/compatibility.py index 8820bc74..9c9eed3e 100644 --- a/snakeoil/compatibility.py +++ b/snakeoil/compatibility.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ Compatibility module providing native reimplementations of python2.5 functionality. diff --git a/snakeoil/containers.py b/snakeoil/containers.py index b17f9dd9..c6bbda06 100644 --- a/snakeoil/containers.py +++ b/snakeoil/containers.py @@ -1,5 +1,5 @@ # Copyright: 2005-2009 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ collection of container classes diff --git a/snakeoil/currying.py b/snakeoil/currying.py index 63a2f48d..64f559da 100644 --- a/snakeoil/currying.py +++ b/snakeoil/currying.py @@ -1,5 +1,5 @@ # Copyright: 2005 Brian Harring -# 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 index dc137ede..17f8d84d 100644 --- a/snakeoil/debug_imports.py +++ b/snakeoil/debug_imports.py @@ -1,6 +1,6 @@ #!/usr/bin/python # Copyright: 2007 Brian Harring -# License: GPL2 +# License: BSD/GPL2 import __builtin__ diff --git a/snakeoil/demandload.py b/snakeoil/demandload.py index c941313e..d923397d 100644 --- a/snakeoil/demandload.py +++ b/snakeoil/demandload.py @@ -1,5 +1,5 @@ # Copyright: 2006 Vadim Gelfer -# Copyright: 2007 Marien Zwart +# Copyright: 2007 Marien Zwart : GPL2/BSD # License: GPL2 """Demand load things when used. diff --git a/snakeoil/dependant_methods.py b/snakeoil/dependant_methods.py index b697f34a..f0a86566 100644 --- a/snakeoil/dependant_methods.py +++ b/snakeoil/dependant_methods.py @@ -1,5 +1,5 @@ # Copyright: 2005-2008 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """Metaclass to inject dependencies into method calls. diff --git a/snakeoil/descriptors.py b/snakeoil/descriptors.py index bf31b9f8..e65fa279 100644 --- a/snakeoil/descriptors.py +++ b/snakeoil/descriptors.py @@ -1,5 +1,5 @@ # Copyright: 2006 Marien Zwart -# License: GPL2 +# License: BSD/GPL2 """Classes implementing the descriptor protocol.""" diff --git a/snakeoil/fileutils.py b/snakeoil/fileutils.py index f01d6243..8459fd05 100644 --- a/snakeoil/fileutils.py +++ b/snakeoil/fileutils.py @@ -1,5 +1,5 @@ # Copyright: 2005-2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ file related operations, mainly reading diff --git a/snakeoil/formatters.py b/snakeoil/formatters.py index 05c2c576..2fa55b95 100644 --- a/snakeoil/formatters.py +++ b/snakeoil/formatters.py @@ -1,5 +1,5 @@ # Copyright: 2006 Marien Zwart -# 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 index e6f05bfa..696d45c4 100644 --- a/snakeoil/iterables.py +++ b/snakeoil/iterables.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 from collections import deque diff --git a/snakeoil/klass.py b/snakeoil/klass.py index 11006299..f6433336 100644 --- a/snakeoil/klass.py +++ b/snakeoil/klass.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 from operator import attrgetter from snakeoil.caching import WeakInstMeta diff --git a/snakeoil/lists.py b/snakeoil/lists.py index 9da8d663..4eeba095 100644 --- a/snakeoil/lists.py +++ b/snakeoil/lists.py @@ -1,5 +1,5 @@ # Copyright: 2005 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ sequence related operations diff --git a/snakeoil/mappings.py b/snakeoil/mappings.py index 012ada2e..54561b9c 100644 --- a/snakeoil/mappings.py +++ b/snakeoil/mappings.py @@ -1,5 +1,5 @@ # Copyright: 2005-2009 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ miscellanious mapping/dict related classes diff --git a/snakeoil/modules.py b/snakeoil/modules.py index d6850018..f70c9d16 100644 --- a/snakeoil/modules.py +++ b/snakeoil/modules.py @@ -1,5 +1,5 @@ # Copyright: 2005 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ dynamic import functionality diff --git a/snakeoil/obj.py b/snakeoil/obj.py index fdeb80c6..74f903d6 100644 --- a/snakeoil/obj.py +++ b/snakeoil/obj.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# 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 index 0c974a1b..dcb7e4e0 100644 --- a/snakeoil/osutils/__init__.py +++ b/snakeoil/osutils/__init__.py @@ -1,6 +1,6 @@ # Copyright 2004-2007 Brian Harring # Copyright 2006 Marien Zwart -# 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 index c09eb1d2..d74cf963 100644 --- a/snakeoil/osutils/native_readdir.py +++ b/snakeoil/osutils/native_readdir.py @@ -1,6 +1,6 @@ # Copyright: 2006-2007 Brian Harring # Copyright: 2006 Marien Zwart -# 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 index 58b6a2e4..e4249478 100644 --- a/snakeoil/pickling.py +++ b/snakeoil/pickling.py @@ -1,5 +1,5 @@ # Copyright: 2007 Brian Harring -# 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 index a1181bf7..c291e50a 100644 --- a/snakeoil/tar.py +++ b/snakeoil/tar.py @@ -1,5 +1,5 @@ # Copyright: 2006-2009 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ tar file access diff --git a/snakeoil/test/__init__.py b/snakeoil/test/__init__.py index dfc27f3d..bfdf31d3 100644 --- a/snakeoil/test/__init__.py +++ b/snakeoil/test/__init__.py @@ -1,6 +1,6 @@ # Copyright: 2006-2007 Brian Harring # Copyright: 2006 Marien Zwart -# License: GPL2 +# License: BSD/GPL2 """Our unittest extensions.""" diff --git a/snakeoil/test/mixins.py b/snakeoil/test/mixins.py index 1ae84cb8..159411a8 100644 --- a/snakeoil/test/mixins.py +++ b/snakeoil/test/mixins.py @@ -1,6 +1,6 @@ # Copyright: 2005 Marien Zwart # Copyright: 2009 Brian Harring -# 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 -# License: GPL2 +# License: BSD/GPL2 import os, stat, errno diff --git a/snakeoil/test/test_caching.py b/snakeoil/test/test_caching.py index 154eb058..649651da 100644 --- a/snakeoil/test/test_caching.py +++ b/snakeoil/test/test_caching.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# 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 index ecfacab1..683f2ecc 100644 --- a/snakeoil/test/test_compatibility.py +++ b/snakeoil/test/test_compatibility.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# 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 index 3651911d..9381fcf1 100644 --- a/snakeoil/test/test_containers.py +++ b/snakeoil/test/test_containers.py @@ -1,5 +1,5 @@ # Copyright: 2005 Marien Zwart -# License: GPL2 +# License: BSD/GPL2 from itertools import chain diff --git a/snakeoil/test/test_currying.py b/snakeoil/test/test_currying.py index 597c54fc..0f692768 100644 --- a/snakeoil/test/test_currying.py +++ b/snakeoil/test/test_currying.py @@ -1,5 +1,5 @@ # Copyright: 2005 Marien Zwart -# 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 index 081e0c1c..742e58f5 100644 --- a/snakeoil/test/test_demandload.py +++ b/snakeoil/test/test_demandload.py @@ -1,5 +1,5 @@ # Copyright: 2007 Marien Zwart -# 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 index 657831d2..1fa466d6 100644 --- a/snakeoil/test/test_demandload_usage.py +++ b/snakeoil/test/test_demandload_usage.py @@ -1,5 +1,5 @@ # Copyright: 2005-2009 Brian Harring -# 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 index 5b4f11ec..39fef6a2 100644 --- a/snakeoil/test/test_dependant_methods.py +++ b/snakeoil/test/test_dependant_methods.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# 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 index 0f2da913..d72e700d 100644 --- a/snakeoil/test/test_descriptors.py +++ b/snakeoil/test/test_descriptors.py @@ -1,5 +1,5 @@ # Copyright: 2006 Marien Zwart -# License: GPL2 +# License: BSD/GPL2 from snakeoil.test import TestCase diff --git a/snakeoil/test/test_fileutils.py b/snakeoil/test/test_fileutils.py index bac875b8..9001e99a 100644 --- a/snakeoil/test/test_fileutils.py +++ b/snakeoil/test/test_fileutils.py @@ -1,5 +1,5 @@ # Copyright: 2005 Marien Zwart -# License: GPL2 +# License: BSD/GPL2 import tempfile, os diff --git a/snakeoil/test/test_formatters.py b/snakeoil/test/test_formatters.py index 7e795891..b2c53616 100644 --- a/snakeoil/test/test_formatters.py +++ b/snakeoil/test/test_formatters.py @@ -1,6 +1,6 @@ # Copyright: 2007 Brian Harring # Copyright: 2006 Marien Zwart -# 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 index 823af87b..df652929 100644 --- a/snakeoil/test/test_iterables.py +++ b/snakeoil/test/test_iterables.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 import operator diff --git a/snakeoil/test/test_klass.py b/snakeoil/test/test_klass.py index 5efd6aef..c8060501 100644 --- a/snakeoil/test/test_klass.py +++ b/snakeoil/test/test_klass.py @@ -1,5 +1,5 @@ # Copyright: 2006-2007 Brian Harring -# 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 index a8ba5f2e..aedf103c 100644 --- a/snakeoil/test/test_lists.py +++ b/snakeoil/test/test_lists.py @@ -1,5 +1,5 @@ # Copyright: 2005 Marien Zwart -# License: GPL2 +# License: BSD/GPL2 from snakeoil.test import TestCase diff --git a/snakeoil/test/test_mappings.py b/snakeoil/test/test_mappings.py index d84dab20..34a79fda 100644 --- a/snakeoil/test/test_mappings.py +++ b/snakeoil/test/test_mappings.py @@ -1,6 +1,6 @@ # Copyright: 2005-2006 Marien Zwart # Copyright: 2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 import operator diff --git a/snakeoil/test/test_modules.py b/snakeoil/test/test_modules.py index c3ae6b84..2871bbc0 100644 --- a/snakeoil/test/test_modules.py +++ b/snakeoil/test/test_modules.py @@ -1,5 +1,5 @@ # Copyright: 2005 Marien Zwart -# License: GPL2 +# License: BSD/GPL2 from snakeoil.test import TestCase diff --git a/snakeoil/test/test_obj.py b/snakeoil/test/test_obj.py index a426211d..5c202726 100644 --- a/snakeoil/test/test_obj.py +++ b/snakeoil/test/test_obj.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 import operator diff --git a/snakeoil/test/test_osutils.py b/snakeoil/test/test_osutils.py index 4836e251..126907ed 100644 --- a/snakeoil/test/test_osutils.py +++ b/snakeoil/test/test_osutils.py @@ -1,6 +1,6 @@ # Copyright: 2005-2009 Brian Harring # Copyright: 2006 Marien Zwart -# 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 index 82397f2d..4fa50ff6 100644 --- a/snakeoil/test/test_weakrefs.py +++ b/snakeoil/test/test_weakrefs.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# 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 index 77cfe7d3..15a3a65b 100644 --- a/snakeoil/version.py +++ b/snakeoil/version.py @@ -1,5 +1,5 @@ # Copyright: 2006 Marien Zwart -# License: GPL2 +# License: BSD/GPL2 """Version information (tied to bzr).""" diff --git a/snakeoil/weakrefs.py b/snakeoil/weakrefs.py index 16336be1..1fdc6a6a 100644 --- a/snakeoil/weakrefs.py +++ b/snakeoil/weakrefs.py @@ -1,5 +1,5 @@ # Copyright: 2006 Brian Harring -# License: GPL2 +# License: BSD/GPL2 # Unused import # pylint: disable-msg=W0611 diff --git a/snakeoil/xml/__init__.py b/snakeoil/xml/__init__.py index 83bf5ec7..63571e69 100644 --- a/snakeoil/xml/__init__.py +++ b/snakeoil/xml/__init__.py @@ -1,5 +1,5 @@ # Copyright: 2006-2009 Brian Harring -# License: GPL2 +# License: BSD/GPL2 """ indirection to load ElementTree diff --git a/src/caching.c b/src/caching.c index 09e4874b..8404ed76 100644 --- a/src/caching.c +++ b/src/caching.c @@ -1,7 +1,7 @@ /* * Copyright: 2006-2007 Brian Harring * Copyright: 2006 Marien Zwart - * 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 index eb2b2eb9..8d776010 100644 --- a/src/formatters.c +++ b/src/formatters.c @@ -1,3 +1,9 @@ +/* + Copyright: 2007-2010 Charlie Shepherd + Copyright: 2009-2010 Brian Harring + License: BSD/GPL2 +*/ + #include "Python.h" #include #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); diff --git a/src/klass.c b/src/klass.c index 0e00b46c..0c3cd3f0 100644 --- a/src/klass.c +++ b/src/klass.c @@ -1,6 +1,6 @@ /* * Copyright: 2006-2007 Brian Harring - * License: GPL2 + * License: GPL2/BSD * * C version of some of snakeoil (for extra speed). */ @@ -1234,7 +1234,7 @@ PyDoc_STRVAR( PyMODINIT_FUNC -init_klass() +init_klass(void) { PyObject *m = Py_InitModule3("_klass", NULL, snakeoil_klass_documentation); if (!m) diff --git a/src/lists.c b/src/lists.c index b07a740a..1a26e237 100644 --- a/src/lists.c +++ b/src/lists.c @@ -1,6 +1,6 @@ /* * Copyright: 2006 Marien Zwart - * License: GPL2 + * License: GPL2/BSD * * C version of some of snakeoil (for extra speed). */ @@ -456,7 +456,7 @@ PyDoc_STRVAR( "C reimplementation of some of snakeoil.lists."); PyMODINIT_FUNC -init_lists() +init_lists(void) { /* Create the module and add the functions */ PyObject *m = Py_InitModule3("_lists", NULL, snakeoil_lists_documentation); diff --git a/src/posix.c b/src/posix.c index 33c1a037..381257f7 100644 --- a/src/posix.c +++ b/src/posix.c @@ -1,6 +1,6 @@ /* * Copyright: 2006-2007 Brian Harring - * License: GPL2 + * License: GPL2/BSD * * C version of some of snakeoil (for extra speed). */ @@ -676,7 +676,7 @@ PyDoc_STRVAR( "cpython posix path functionality"); PyMODINIT_FUNC -init_posix() +init_posix(void) { PyObject *s = PyString_FromString("os"); if(!s) diff --git a/src/readdir.c b/src/readdir.c index 80ebd30e..9d9359c3 100644 --- a/src/readdir.c +++ b/src/readdir.c @@ -1,7 +1,7 @@ /* * Copyright: 2006 Brian Harring * Copyright: 2006-2007 Marien Zwart - * License: GPL2 + * License: GPL2/BSD * * C version of some of snakeoil (for extra speed). */ @@ -360,7 +360,7 @@ PyDoc_STRVAR( "C reimplementation of some of snakeoil.osutils"); PyMODINIT_FUNC -init_readdir() +init_readdir(void) { PyObject *m;