From: Zooko O'Whielacronx Date: Mon, 25 Jul 2011 01:55:46 +0000 (-0700) Subject: whitespace-cleanup X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=420e3aa2930cf1e72c8239193f306d42977c851c;p=tahoe-lafs%2Ftahoe-lafs.git whitespace-cleanup --- diff --git a/docs/configuration.rst b/docs/configuration.rst index a5767252..eb6fc1bb 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -249,6 +249,7 @@ set the ``tub.location`` option described below. used for files that usually (on a Unix system) go into ``/tmp``. The string will be interpreted relative to the node's base directory. + Client Configuration ==================== @@ -321,6 +322,7 @@ Client Configuration (Mutable files use a different share placement algorithm that does not currently consider this parameter.) + Frontend Configuration ====================== @@ -355,6 +357,7 @@ FTP, SFTP ``[sftpd]`` sections of ``tahoe.cfg``. + Storage Server Configuration ============================ @@ -540,6 +543,7 @@ This section describes these other files. many people as possible, put the empty string (so that ``private/convergence`` is a zero-length file). + Other files =========== diff --git a/src/allmydata/node.py b/src/allmydata/node.py index 7f5bf61e..99665e5f 100644 --- a/src/allmydata/node.py +++ b/src/allmydata/node.py @@ -1,4 +1,3 @@ - import datetime, os.path, re, types, ConfigParser, tempfile from base64 import b32decode, b32encode @@ -61,7 +60,6 @@ class Node(service.MultiService): # creates self.config, populates from distinct files if necessary self.read_config() - nickname_utf8 = self.get_config("node", "nickname", "") self.nickname = nickname_utf8.decode("utf-8") assert type(self.nickname) is unicode @@ -344,4 +342,3 @@ class Node(service.MultiService): def add_service(self, s): s.setServiceParent(self) return s - diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py index d68e50af..589d540d 100644 --- a/src/allmydata/test/common.py +++ b/src/allmydata/test/common.py @@ -336,7 +336,6 @@ class LoggingServiceParent(service.MultiService): def log(self, *args, **kwargs): return log.msg(*args, **kwargs) - class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin): # SystemTestMixin tests tend to be a lot of work, and we have a few diff --git a/src/allmydata/test/test_client.py b/src/allmydata/test/test_client.py index 629660b6..1f96a424 100644 --- a/src/allmydata/test/test_client.py +++ b/src/allmydata/test/test_client.py @@ -1,4 +1,3 @@ - import os from twisted.trial import unittest from twisted.application import service diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py index 95309327..d13f6dae 100644 --- a/src/allmydata/test/test_runner.py +++ b/src/allmydata/test/test_runner.py @@ -1,4 +1,3 @@ - from twisted.trial import unittest from twisted.python import usage, runtime