From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 21 May 2007 20:42:51 +0000 (-0700)
Subject: update docs, remove extraneous licence text, sort module names in import statement
X-Git-Tag: allmydata-tahoe-0.3.0~74
X-Git-Url: https://git.rkrishnan.org/class-simplejson.JSONEncoder.html?a=commitdiff_plain;h=3d1adf6d30c822f5d0e4dd164f3015d66dfbfb46;p=tahoe-lafs%2Ftahoe-lafs.git

update docs, remove extraneous licence text, sort module names in import statement
closes #46 ?
---

diff --git a/README b/README
index 793b170c..7fe024cb 100644
--- a/README
+++ b/README
@@ -148,7 +148,7 @@ There are three ways to do it.  Choose one:
   You'll need to run "setup.py install" four separate times, one for each of
   the four subpackages (allmydata, allmydata.Crypto, foolscap, and zfec).  If
   you use GNU stow, add the options "--prefix=." and
-  "--root=/usr/local/stow/${PACKAGE}" to the "setup.py install" command.
+  "--root=/usr/local/stow/${PACKAGE}" after the "setup.py install" command.
 
     for PACKAGE in zfec Crypto foolscap ; do
       cd src/${PACKAGE} && python setup.py install && cd ../..
diff --git a/setup.py b/setup.py
index 15eda54e..7596a5b8 100644
--- a/setup.py
+++ b/setup.py
@@ -17,11 +17,6 @@
 # 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.
 
 import re, os.path
 from distutils.core import Extension, setup
diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index d9f49672..b70a4a19 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -4,7 +4,8 @@ from twisted.python import log
 from twisted.application import service
 from twisted.internet import defer
 from foolscap import Tub
-from allmydata.util import idlib, observer, iputil
+from allmydata.util import idlib, iputil, observer
+
 
 # Just to get their versions:
 import allmydata