zfec: update licence, contact info, description

diff --git a/src/zfec/COPYING b/src/zfec/COPYING
index d7e9f2a3922689a034a1c863d2439788bae946ba..ff1017ad9bc8ec3c70d067d701b24f9c19ede7a1 100644 (file)
--- a/src/zfec/COPYING
+++ b/src/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/src/zfec/setup.py b/src/zfec/setup.py
index 4e908034b99eb2f2ba6da2c3bfd636e4204469f6..3ed898535bdb5de6fd349c13ccde829213064288 100644 (file)
--- a/src/zfec/setup.py
+++ b/src/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/src/zfec/zfec/__init__.py b/src/zfec/zfec/__init__.py
index e7ce28e3eba1b175dbb57f80ac00dc89290a171a..37b4a1984e5485b4886ceb3e5b2be22e92645577 100644 (file)
--- a/src/zfec/zfec/__init__.py
+++ b/src/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/src/zfec/zfec/_fecmodule.c b/src/zfec/zfec/_fecmodule.c
index 4a156a7e8f3de033ff3c9fd10fddedd9636e7e57..b973d118aa69b66374914b91d54e136ed947173f 100644 (file)
--- a/src/zfec/zfec/_fecmodule.c
+++ b/src/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/src/zfec/zfec/cmdline_zfec.py b/src/zfec/zfec/cmdline_zfec.py
index 5c62fa869f3af6b5643e273efcc860d84e57769e..f399fd1c214f8059e58ddd368054eeb0baf2b8ad 100644 (file)
--- a/src/zfec/zfec/cmdline_zfec.py
+++ b/src/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/src/zfec/zfec/cmdline_zunfec.py b/src/zfec/zfec/cmdline_zunfec.py
index a56dd5cab9bd495dbd46775ae05dfc7d97a33e9f..7c9f3f621c328888b6316317e8e737447963326a 100644 (file)
--- a/src/zfec/zfec/cmdline_zunfec.py
+++ b/src/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/src/zfec/zfec/easyfec.py b/src/zfec/zfec/easyfec.py
index 97c73814b937fb5ab28ae06edc737a8ca42e9675..db36b321f3a6de427c35b2dc6851bad0ffa18945 100644 (file)
--- a/src/zfec/zfec/easyfec.py
+++ b/src/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/src/zfec/zfec/fec.c b/src/zfec/zfec/fec.c
index 4d64e29628d22e6ec470fa51560ef58ee453aab6..6b5fa86b96b7dc35c8ea35329892e4a96cea1496 100644 (file)
--- a/src/zfec/zfec/fec.c
+++ b/src/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/src/zfec/zfec/fec.h b/src/zfec/zfec/fec.h
index 40ae1dc180cbed58a2392e67d09356ade43a9450..1e8b44d90f5b5e00e26cbe39ba4f7bb9f4391a2c 100644 (file)
--- a/src/zfec/zfec/fec.h
+++ b/src/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/src/zfec/zfec/filefec.py b/src/zfec/zfec/filefec.py
index 43b5ab9bc353eae3734fd70d9dc2474393aec1dc..d35ec7220534b5d216180699376e1c0616391c75 100644 (file)
--- a/src/zfec/zfec/filefec.py
+++ b/src/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/src/zfec/zfec/test/test_util.py b/src/zfec/zfec/test/test_util.py
index a4431b8e73af3e93ed242b5c17664ec36f08d752..12542fdbfbe60a8e6a50c6974e39147f3fe4f3e8 100644 (file)
--- a/src/zfec/zfec/test/test_util.py
+++ b/src/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/src/zfec/zfec/test/test_zfec.py b/src/zfec/zfec/test/test_zfec.py
index 0e60d1e17f1ba057287f63d7bfab2275f99fd32f..70ced57b6e6fbfa90891ccf5104641f1d9ceb50f 100644 (file)
--- a/src/zfec/zfec/test/test_zfec.py
+++ b/src/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/src/zfec/zfec/util/fileutil.py b/src/zfec/zfec/util/fileutil.py
index 2821c973f083fd5d486572b45f3af4222495296b..67178d7ca08211e4f04e4b23930b504437b37b25 100644 (file)
--- a/src/zfec/zfec/util/fileutil.py
+++ b/src/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/src/zfec/zfec/util/mathutil.py b/src/zfec/zfec/util/mathutil.py
index 203e95a7fc23ff3064f097268c81535297dcb81e..8bf1be7dbb4efabf31d82e6c5f77b28c5fedd459 100644 (file)
--- a/src/zfec/zfec/util/mathutil.py
+++ b/src/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/src/zfec/zfec/util/version.py b/src/zfec/zfec/util/version.py
index 625cbfc76fb7f95eccc8a2fd6960965c8a6d0a88..ba30ca22d3c1ff0f8248d24591ffd80789be853d 100644 (file)
--- a/src/zfec/zfec/util/version.py
+++ b/src/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.