From 7325316f2ae6c201dd78ee0cf16c28c636689651 Mon Sep 17 00:00:00 2001 From: catseye Date: Mon, 27 Aug 2012 09:06:21 -0500 Subject: [PATCH] Clarify this arrangement a bit. --- UNLICENSE | 4 +++- python/mkstemp.py | 2 ++ python/pretty_print_json_hack.sh | 2 ++ python/simple_webserver_hack.sh | 2 ++ python/xml_to_yaml.py | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/UNLICENSE b/UNLICENSE index 2060ae9..fc88271 100644 --- a/UNLICENSE +++ b/UNLICENSE @@ -3,7 +3,9 @@ Dipple are in the public domain, as described in the following Unlicense. Note that all programs which contain example code taken from blogs or "recipe" websites should be assumed to NOT be in the public domain unless -the blog or website specifically says that it is. +the blog or website specifically says that it is. However, the fourth +paragraph (the one in all capitals) of this Unlicense still applies to these +sources. ----------------------------------------------------------------------------- diff --git a/python/mkstemp.py b/python/mkstemp.py index 64df841..e635c51 100644 --- a/python/mkstemp.py +++ b/python/mkstemp.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # A gotcha with mkstemp: see e.g. http://www.logilab.org/blogentry/17873 +# Contains code from a blog, and is therefore not in the public domain. + import os from tempfile import mkstemp diff --git a/python/pretty_print_json_hack.sh b/python/pretty_print_json_hack.sh index a857b26..1f39195 100755 --- a/python/pretty_print_json_hack.sh +++ b/python/pretty_print_json_hack.sh @@ -3,4 +3,6 @@ # pipe JSON into this to pretty-print it. # see: http://stackoverflow.com/questions/352098/how-to-pretty-print-json-script +# Contains code from a website, and is therefore not in the public domain. + python -mjson.tool diff --git a/python/simple_webserver_hack.sh b/python/simple_webserver_hack.sh index e0e0c76..a0bc90f 100755 --- a/python/simple_webserver_hack.sh +++ b/python/simple_webserver_hack.sh @@ -3,4 +3,6 @@ # starts a simple webserver for the current directory on interface 0.0.0.0 port 8000 # see http://www.linuxjournal.com/content/tech-tip-really-simple-http-server-python +# Contains code from a blog, and is therefore not in the public domain. + python -m SimpleHTTPServer diff --git a/python/xml_to_yaml.py b/python/xml_to_yaml.py index 688bee4..37b733c 100755 --- a/python/xml_to_yaml.py +++ b/python/xml_to_yaml.py @@ -4,6 +4,8 @@ # equivalent yaml file. Big problem: embedded HTML; it throws away most of it. # Secondary problem: requires an extra top-level element. +# Contains code from a website, and is therefore not in the public domain. + import sys # easy_install PyYaml