update docs, remove extraneous licence text, sort module names in import statement

closes #46 ?

diff --git a/README b/README
index 793b170c6e12520b1d590b5222795918f3e8aae9..7fe024cb45191bc510ae30f70ca0419de4830e9f 100644 (file)
--- 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 15eda54e5d3e6ac8447635373444c1aab518e858..7596a5b8fddab61c0b84e2d965b5b71d6a5136fd 100644 (file)
--- 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 d9f49672a3d2d4bbd6c5fe7d5fcfaf8f7582190e..b70a4a19a9ec17846371429fcdb9a4fabf31d6ab 100644 (file)
--- 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