From b92da1e8537f46567d9a979043cd919640357c36 Mon Sep 17 00:00:00 2001
From: "Zooko O'Whielacronx zooko@zooko.com" <zooko@zooko.com>
Date: Fri, 27 Apr 2007 23:44:34 +0530
Subject: [PATCH] zfec: update licence, contact info, description

darcs-hash:29090416ae5b474a0c839396cd94ba995a250130
---
 zfec/COPYING                |  9 +++----
 zfec/setup.py               | 27 +++++++++-----------
 zfec/zfec/__init__.py       | 25 ++++++++++++++++++-
 zfec/zfec/_fecmodule.c      | 20 +++++++--------
 zfec/zfec/cmdline_zfec.py   | 29 +++++++++-------------
 zfec/zfec/cmdline_zunfec.py | 28 +++++++++------------
 zfec/zfec/easyfec.py        | 28 +++++++++------------
 zfec/zfec/fec.c             | 29 ++++++++++------------
 zfec/zfec/fec.h             | 27 ++++++++++----------
 zfec/zfec/filefec.py        | 25 +++++++++----------
 zfec/zfec/test/test_util.py | 23 +++++++++++++++++
 zfec/zfec/test/test_zfec.py | 37 +++++++++++++---------------
 zfec/zfec/util/fileutil.py  | 39 +++++++++++++----------------
 zfec/zfec/util/mathutil.py  | 29 ++++++++++++++++------
 zfec/zfec/util/version.py   | 49 ++++++++++++++++++++++++++++++++-----
 15 files changed, 244 insertions(+), 180 deletions(-)

diff --git a/zfec/COPYING b/zfec/COPYING
index d7e9f2a..ff1017a 100644
--- a/zfec/COPYING
+++ b/zfec/COPYING
@@ -1,8 +1,7 @@
-In addition to the terms of the GNU General Public License, the zfec package
-also comes with a special added permission that you may delay for up to 12
-months the fulfillment of your obligation under GPL section 2.b to release any
-derived work under this licence.
-
+In addition to the terms of the GNU General Public License, this licence also
+comes with the added permission that, if you become obligated to release a
+derived work under this licence (as per section 2.b of the GPL), you may
+delay the fulfillment of this obligation for up to 12 months.
 
 
 		    GNU GENERAL PUBLIC LICENSE
diff --git a/zfec/setup.py b/zfec/setup.py
index 4e90803..3ed8985 100755
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -1,30 +1,27 @@
 #!/usr/bin/env python
 
-# zfec -- a fast C implementation of Reed-Solomon erasure coding with
-# command-line, C, and Python interfaces
+# zfec -- fast forward error correction library with Python interface
 # 
 # Copyright (C) 2007 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# mailto:zooko@zooko.com
 # 
 # This file is part of zfec.
 # 
 # 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 package also comes with the added permission that,
-# if you become obligated to release a derived work under this licence (as per
-# section 2.b of the GPL), you may delay the fulfillment of this obligation
-# for up to 12 months.
+# any later version, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+#
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
 # 
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# 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.
 
 from setuptools import Extension, find_packages, setup
 
diff --git a/zfec/zfec/__init__.py b/zfec/zfec/__init__.py
index e7ce28e..37b4a19 100644
--- a/zfec/zfec/__init__.py
+++ b/zfec/zfec/__init__.py
@@ -14,8 +14,31 @@ __version__ = Version("1.0.0a5-1-STABLE")
 
 # Please put a URL or other note here which shows where to get the branch of
 # development from which this version grew.
-__sources__ = ["http://allmydata.com/source/zfec",]
+__sources__ = ["http://allmydata.org/source/zfec",]
 
 from _fec import Encoder, Decoder, Error
 import filefec, cmdline_zfec, cmdline_zunfec
 
+# zfec -- fast forward error correction library with Python interface
+# 
+# Copyright (C) 2007 Allmydata, Inc.
+# Author: Zooko Wilcox-O'Hearn
+# mailto:zooko@zooko.com
+# 
+# This file is part of zfec.
+# 
+# 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, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# 
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
diff --git a/zfec/zfec/_fecmodule.c b/zfec/zfec/_fecmodule.c
index 4a156a7..b973d11 100644
--- a/zfec/zfec/_fecmodule.c
+++ b/zfec/zfec/_fecmodule.c
@@ -586,29 +586,27 @@ init_fec(void) {
 
 /**
  * zfec -- fast forward error correction library with Python interface
- *
+ * 
  * Copyright (C) 2007 Allmydata, Inc.
  * Author: Zooko Wilcox-O'Hearn
- * mailto:zooko@zooko.com
- *
+ * 
  * This file is part of zfec.
  * 
  * 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 license also comes with the added permission that,
- * if you become obligated to release a derived work under this licence (as
- * per section 2.b of the GPL), you may delay the fulfillment of this
- * obligation for up to 12 months.
+ * any later version, with the added permission that, if you become obligated
+ * to release a derived work under this licence (as per section 2.b of the
+ * GPL), you may delay the fulfillment of this obligation for up to 12 months.
  *
+ * If you would like to inquire about a commercial relationship with Allmydata,
+ * Inc., please contact partnerships@allmydata.com and visit
+ * http://allmydata.com/.
+ * 
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 /**
diff --git a/zfec/zfec/cmdline_zfec.py b/zfec/zfec/cmdline_zfec.py
index 5c62fa8..f399fd1 100755
--- a/zfec/zfec/cmdline_zfec.py
+++ b/zfec/zfec/cmdline_zfec.py
@@ -57,30 +57,25 @@ def main():
     args.inputfile.seek(0, 0)
     return filefec.encode_to_files(args.inputfile, fsize, args.output_dir, args.prefix, args.requiredshares, args.totalshares, args.suffix, args.force, args.verbose)
 
-
-# zfec -- a fast C implementation of Reed-Solomon erasure coding with
-# command-line, C, and Python interfaces
+# zfec -- fast forward error correction library with Python interface
 # 
 # Copyright (C) 2007 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# mailto:zooko@zooko.com
 # 
 # This file is part of zfec.
 # 
 # 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 license also comes with the added permission that,
-# if you become obligated to release a derived work under this licence (as per
-# section 2.b of the GPL), you may delay the fulfillment of this obligation
-# for up to 12 months.
+# any later version, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+#
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
 # 
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# 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.
diff --git a/zfec/zfec/cmdline_zunfec.py b/zfec/zfec/cmdline_zunfec.py
index a56dd5c..7c9f3f6 100755
--- a/zfec/zfec/cmdline_zunfec.py
+++ b/zfec/zfec/cmdline_zunfec.py
@@ -59,29 +59,25 @@ def main():
 
     return 0
 
-# zfec -- a fast C implementation of Reed-Solomon erasure coding with
-# command-line, C, and Python interfaces
+# zfec -- fast forward error correction library with Python interface
 # 
 # Copyright (C) 2007 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# mailto:zooko@zooko.com
 # 
 # This file is part of zfec.
 # 
 # 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 license also comes with the added permission that,
-# if you are obligated to release a derived work under this licence (as per
-# section 2.b of the GPL), you may delay the fulfillment of this obligation
-# for up to 12 months.
+# any later version, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+#
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
 # 
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# 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.
diff --git a/zfec/zfec/easyfec.py b/zfec/zfec/easyfec.py
index 97c7381..db36b32 100644
--- a/zfec/zfec/easyfec.py
+++ b/zfec/zfec/easyfec.py
@@ -38,30 +38,26 @@ class Decoder(object):
             data = data[:-padlen]
         return data
 
-
-# zfec -- a fast C implementation of Reed-Solomon erasure coding with
-# command-line, C, and Python interfaces
+# zfec -- fast forward error correction library with Python interface
 # 
 # Copyright (C) 2007 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# mailto:zooko@zooko.com
 # 
 # This file is part of zfec.
 # 
 # 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 package also comes with the added permission that,
-# if you become obligated to release a derived work under this licence (as per
-# section 2.b of the GPL), you may delay the fulfillment of this obligation
-# for up to 12 months.
-# 
-# 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.
+# any later version, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+#
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
 # 
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# 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.
 
diff --git a/zfec/zfec/fec.c b/zfec/zfec/fec.c
index 4d64e29..6b5fa86 100644
--- a/zfec/zfec/fec.c
+++ b/zfec/zfec/fec.c
@@ -553,29 +553,27 @@ fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf*
 
 /**
  * zfec -- fast forward error correction library with Python interface
- *
+ * 
  * Copyright (C) 2007 Allmydata, Inc.
  * Author: Zooko Wilcox-O'Hearn
- * mailto:zooko@zooko.com
- *
+ * 
  * This file is part of zfec.
  * 
  * 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 license also comes with the added permission that,
- * if you become obligated to release a derived work under this licence (as
- * per section 2.b of the GPL), you may delay the fulfillment of this
- * obligation for up to 12 months.
+ * any later version, with the added permission that, if you become obligated
+ * to release a derived work under this licence (as per section 2.b of the
+ * GPL), you may delay the fulfillment of this obligation for up to 12 months.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * If you would like to inquire about a commercial relationship with Allmydata,
+ * Inc., please contact partnerships@allmydata.com and visit
+ * http://allmydata.com/.
+ * 
+ * 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.
  */
 
 /*
@@ -618,4 +616,3 @@ fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf*
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  */
-
diff --git a/zfec/zfec/fec.h b/zfec/zfec/fec.h
index 40ae1dc..1e8b44d 100644
--- a/zfec/zfec/fec.h
+++ b/zfec/zfec/fec.h
@@ -33,31 +33,30 @@ void fec_encode(const fec_t* code, const gf*restrict const*restrict const src, g
  */
 void fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf*restrict const*restrict const outpkts, const unsigned*restrict const index, size_t sz);
 
+
 /**
  * zfec -- fast forward error correction library with Python interface
- *
+ * 
  * Copyright (C) 2007 Allmydata, Inc.
  * Author: Zooko Wilcox-O'Hearn
- * mailto:zooko@zooko.com
  * 
  * This file is part of zfec.
  * 
  * 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 license also comes with the added permission that,
- * if you become obligated to release a derived work under this licence (as
- * per section 2.b of the GPL), you may delay the fulfillment of this
- * obligation for up to 12 months.
- * 
- * 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.
+ * any later version, with the added permission that, if you become obligated
+ * to release a derived work under this licence (as per section 2.b of the
+ * GPL), you may delay the fulfillment of this obligation for up to 12 months.
+ *
+ * If you would like to inquire about a commercial relationship with Allmydata,
+ * Inc., please contact partnerships@allmydata.com and visit
+ * http://allmydata.com/.
  * 
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 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.
  */
 
 /*
diff --git a/zfec/zfec/filefec.py b/zfec/zfec/filefec.py
index 43b5ab9..d35ec72 100644
--- a/zfec/zfec/filefec.py
+++ b/zfec/zfec/filefec.py
@@ -414,24 +414,21 @@ def encode_file_stringy_easyfec(inf, cb, k, m, chunksize=4096):
 # 
 # Copyright (C) 2007 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# mailto:zooko@zooko.com
 # 
 # This file is part of zfec.
 # 
 # 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 license also comes with the added permission that,
-# if you become obligated to release a derived work under this licence (as per
-# section 2.b of the GPL), you may delay the fulfillment of this obligation
-# for up to 12 months.
+# any later version, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+#
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
 # 
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# 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.
diff --git a/zfec/zfec/test/test_util.py b/zfec/zfec/test/test_util.py
index a4431b8..12542fd 100644
--- a/zfec/zfec/test/test_util.py
+++ b/zfec/zfec/test/test_util.py
@@ -107,3 +107,26 @@ class Math(unittest.TestCase):
                                      [[1,2,3], [1,3,2],
                                       [2,1,3], [2,3,1],
                                       [3,1,2], [3,2,1]])
+
+# zfec -- fast forward error correction library with Python interface
+# 
+# Copyright (C) 2007 Allmydata, Inc.
+# Author: Zooko Wilcox-O'Hearn
+# 
+# This file is part of zfec.
+# 
+# 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, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+#
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
+# 
+# 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.
diff --git a/zfec/zfec/test/test_zfec.py b/zfec/zfec/test/test_zfec.py
index 0e60d1e..70ced57 100755
--- a/zfec/zfec/test/test_zfec.py
+++ b/zfec/zfec/test/test_zfec.py
@@ -224,27 +224,24 @@ class Cmdline(unittest.TestCase):
 
 
 # zfec -- fast forward error correction library with Python interface
-#
+# 
 # Copyright (C) 2007 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# mailto:zooko@zooko.com
-#
+# 
 # This file is part of zfec.
+# 
+# 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, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
 #
-# 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 also comes with the added permission that, in the case
-# that you are obligated to release a derived work under this licence (as per
-# section 2.b of the GPL), you may delay the fulfillment of this obligation for
-# up to 12 months.
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
+# 
+# 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.
diff --git a/zfec/zfec/util/fileutil.py b/zfec/zfec/util/fileutil.py
index 2821c97..67178d7 100644
--- a/zfec/zfec/util/fileutil.py
+++ b/zfec/zfec/util/fileutil.py
@@ -238,29 +238,24 @@ def remove_if_possible(f):
         pass
 
 # zfec -- fast forward error correction library with Python interface
-#
+# 
 # Copyright (C) 2007 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# mailto:zooko@zooko.com
-#
+# 
 # This file is part of zfec.
+# 
+# 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, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
 #
-# 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 also comes with the added permission that, in the case
-# that you are obligated to release a derived work under this licence (as per
-# section 2.b of the GPL), you may delay the fulfillment of this obligation for
-# up to 12 months.
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-# Portions snarfed out of the Python standard library.
-
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
+# 
+# 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.
diff --git a/zfec/zfec/util/mathutil.py b/zfec/zfec/util/mathutil.py
index 203e95a..8bf1be7 100644
--- a/zfec/zfec/util/mathutil.py
+++ b/zfec/zfec/util/mathutil.py
@@ -71,10 +71,25 @@ def permute(l):
 
     return res
 
-# Copyright (c) 2005-2007 Bryce "Zooko" Wilcox-O'Hearn
-# mailto:zooko@zooko.com
-# http://zooko.com/repos/pyutil
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this work to deal in this work without restriction (including the rights
-# to use, modify, distribute, sublicense, and/or sell copies).
-
+# zfec -- fast forward error correction library with Python interface
+# 
+# Copyright (C) 2007 Allmydata, Inc.
+# Author: Zooko Wilcox-O'Hearn
+# 
+# This file is part of zfec.
+# 
+# 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, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+#
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
+# 
+# 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.
diff --git a/zfec/zfec/util/version.py b/zfec/zfec/util/version.py
index 625cbfc..ba30ca2 100644
--- a/zfec/zfec/util/version.py
+++ b/zfec/zfec/util/version.py
@@ -121,10 +121,47 @@ class Version:
 
         return cmp(self.tags, other.tags)
 
-# Copyright (c) 2004-2007 Bryce "Zooko" Wilcox-O'Hearn
+# zfec -- fast forward error correction library with Python interface
+# 
+# Copyright (C) 2007 Allmydata, Inc.
+# Author: Zooko Wilcox-O'Hearn
 # mailto:zooko@zooko.com
-# http://zooko.com/repos/pyutil
-# Permission is hereby granted, free of charge, to any person obtaining a copy 
-# of this work to deal in this work without restriction (including the rights 
-# to use, modify, distribute, sublicense, and/or sell copies).
-
+# 
+# This file is part of zfec.
+# 
+# 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, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# 
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# 
+# Copyright (C) 2007 Allmydata, Inc.
+# Author: Zooko Wilcox-O'Hearn
+# 
+# This file is part of zfec.
+# 
+# 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, with the added permission that, if you become obligated
+# to release a derived work under this licence (as per section 2.b of the
+# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+#
+# If you would like to inquire about a commercial relationship with Allmydata,
+# Inc., please contact partnerships@allmydata.com and visit
+# http://allmydata.com/.
+# 
+# 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.
-- 
2.45.2