Skip to content

Commit 7c9f9d9

Browse files
committed
Merge pull request #4 from irl/license-details
Clarify copyright and licensing
2 parents 745deeb + 99ad104 commit 7c9f9d9

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

LICENSE

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
BSD-style license
22
=================
33

4-
Copyright (c) 2010, Michael Stephens
4+
Copyright (c) 2010 Michael Stephens <[email protected]>
5+
Copyright (c) 2012-2013 Michael Smith <[email protected]>
56

67
All rights reserved.
78

README.rst

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ python-duckduckgo
44

55
A Python library for querying the DuckDuckGo API.
66

7-
Copyright Michael Stephens <[email protected]>, released under a BSD-style license.
7+
Copyright (c) 2010 Michael Stephens <[email protected]>
8+
Copyright (c) 2012-2013 Michael Smith <[email protected]>
89

9-
Source: http://github.com/crazedpsyc/python-duckduckgo
10+
Released under a 3-clause BSD license, see LICENSE for details.
11+
12+
Latest Source: http://github.com/crazedpsyc/python-duckduckgo
1013
Original source: http://github.com/mikejs/python-duckduckgo (outdated)
1114

12-
This version has been forked from the original to handle some new features of the API, and switch from XML to JSON.
15+
This version has been forked from the original to handle some new features of
16+
the API, and switch from XML to JSON.
1317

1418
Installation
1519
============

duckduckgo.py

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# duckduckgo.py - Library for querying the DuckDuckGo API
2+
#
3+
# Copyright (c) 2010 Michael Stephens <[email protected]>
4+
# Copyright (c) 2012-2013 Michael Smith <[email protected]>
5+
#
6+
# See LICENSE for terms of usage, modification and redistribution.
7+
18
import urllib
29
import urllib2
310
import json as j

0 commit comments

Comments
 (0)