Merge pull request #157 from p-push/authors

Update authors

4 files changed, 76 insertions, 33 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..01d2a8e
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,46 @@
+Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
+Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+Copyright (C) 2013-2014 by Oleg Pudeyev <oleg at bsdpower.com>
+
+Please see README, COPYING-LGPL and COPYING-MIT for license information.
+
+The following individuals contributed code to PycURL:
+
+Aaron Hill <visine19 at hotmail.com>
+Adam Guthrie <therigu at users.sourceforge.net>
+Adam Jacob Muller <adam at isprime.com>
+Amit Mongia <amit_mongia at hotmail.com>
+Andjelko Horvat <comel at vingd.com>
+Bastian Kleineidam
+Christopher Warner <cwarner at kernelcode.com>
+Conrad Steenberg <conrad at hep.caltech.edu>
+Daniel Pena Arteaga <dpena at ph.tum.de>
+Domenico Andreoli <cavok at libero.it>
+Dominique <curl-and-python at d242.net>
+Eric S. Raymond <esr at thyrsus.com>
+Gisle Vanem <gvanem at yahoo.no>
+Jakob Truelsen <jakob at scalgo.com>
+Jayne <corvine at gmail.com>
+Jim Patterson
+K.S.Sreeram <sreeram at tachyontech.net>
+Kamil Dudka <kdudka at redhat.com>
+Kevin Ko <kevin.s.ko at gmail.com>
+Marcelo Jorge Vieira <metal at alucinados.com>
+Marien Zwart
+Mark Eichin
+Martin Muenstermann <mamuema at sourceforge.net>
+Matt King <matt at gnik.com>
+Nick Pilon <npilon at oreilly.com>
+Oskari Saarenmaa <os at ohmu.fi>
+Paul Pacheco
+Roland Sommer <rol at ndsommer.de>
+Romuald Brunet <romuald at gandi.net>
+Romulo A. Ceccon <romuloceccon at gmail.com>
+Thomas Hunger <teh at camvine.org>
+Tino Lange <Tino.Lange at gmx.de>
+Tom Pierce <tom.pierce0 at gmail.com>
+Victor Lascurain <bittor at eleka.net>
+Wim Lewis
+Yuhui H <eyecat at gmail.com>
+Yuri Ushakov <yuri.ushakov at gmail.com>
+Zdenek Pavlas <zpavlas at redhat.com>
diff --git a/ChangeLog b/ChangeLog
index 311eaa5..1b577be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,8 @@ master
 
         * SSL detection logic changed to consult `curl-config --static-libs`
           even if `curl-config --libs` succeeded. This should achieve
-          pre-7.19.3 behavior with respect to automatic SSL detection.
+          pre-7.19.3 behavior with respect to automatic SSL detection
+          (patch by Andjelko Horvat).
 
 Version 7.19.3 [requires libcurl-7.19.0 or better] - 2014-01-09
 ---------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 3be87c8..8979df2 100644
--- a/setup.py
+++ b/setup.py
@@ -439,6 +439,32 @@ def check_manifest():
         if not included:
             print(path)
 
+AUTHORS_PARAGRAPH = 3
+
+def check_authors():
+    f = open('AUTHORS')
+    try:
+        contents = f.read()
+    finally:
+        f.close()
+    
+    paras = contents.split("\n\n")
+    authors_para = paras[AUTHORS_PARAGRAPH]
+    authors = [author for author in authors_para.strip().split("\n")]
+    
+    log = subprocess.check_output(['git', 'log', '--format=%an (%ae)'])
+    for author in log.strip().split("\n"):
+        author = author.replace('@', ' at ').replace('(', '<').replace(')', '>')
+        if author not in authors:
+            authors.append(author)
+    authors.sort()
+    paras[AUTHORS_PARAGRAPH] = "\n".join(authors)
+    f = open('AUTHORS', 'w')
+    try:
+        f.write("\n\n".join(paras))
+    finally:
+        f.close()
+
 ###############################################################################
 
 setup_args = dict(
@@ -513,6 +539,8 @@ if __name__ == "__main__":
         setup(**setup_args)
     elif len(sys.argv) > 1 and sys.argv[1] == 'manifest':
         check_manifest()
+    elif len(sys.argv) > 1 and sys.argv[1] == 'authors':
+        check_authors()
     else:
         setup_args['data_files'] = get_data_files()
         ext = get_extension()
diff --git a/src/pycurl.c b/src/pycurl.c
index 9612868..6e347d9 100644
--- a/src/pycurl.c
+++ b/src/pycurl.c
@@ -1,36 +1,4 @@
 /* PycURL -- cURL Python module
- *
- * Authors:
- *  Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
- *  Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
- *  Copyright (C) 2013-2014 by Oleg Pudeyev <oleg at bsdpower.com>
- *
- *  All rights reserved.
- *
- * Contributions:
- *  Tino Lange <Tino.Lange at gmx.de>
- *  Matt King <matt at gnik.com>
- *  Conrad Steenberg <conrad at hep.caltech.edu>
- *  Amit Mongia <amit_mongia at hotmail.com>
- *  Eric S. Raymond <esr at thyrsus.com>
- *  Martin Muenstermann <mamuema at sourceforge.net>
- *  Domenico Andreoli <cavok at libero.it>
- *  Dominique <curl-and-python at d242.net>
- *  Paul Pacheco
- *  Victor Lascurain <bittor at eleka.net>
- *  K.S.Sreeram <sreeram at tachyontech.net>
- *  Jayne <corvine at gmail.com>
- *  Bastian Kleineidam
- *  Mark Eichin
- *  Aaron Hill <visine19 at hotmail.com>
- *  Daniel Pena Arteaga <dpena at ph.tum.de>
- *  Jim Patterson
- *  Yuhui H <eyecat at gmail.com>
- *  Nick Pilon <npilon at oreilly.com>
- *  Thomas Hunger <teh at camvine.org>
- *  Wim Lewis
- *
- * See file README for license information.
  */
 
 #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)