whitespace-cleanup

This commit is contained in:
Zooko O'Whielacronx 2011-07-24 18:55:46 -07:00
parent 3505a8a31c
commit 420e3aa293
5 changed files with 4 additions and 6 deletions

View File

@ -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 used for files that usually (on a Unix system) go into ``/tmp``. The string
will be interpreted relative to the node's base directory. will be interpreted relative to the node's base directory.
Client Configuration Client Configuration
==================== ====================
@ -321,6 +322,7 @@ Client Configuration
(Mutable files use a different share placement algorithm that does not (Mutable files use a different share placement algorithm that does not
currently consider this parameter.) currently consider this parameter.)
Frontend Configuration Frontend Configuration
====================== ======================
@ -355,6 +357,7 @@ FTP, SFTP
``[sftpd]`` sections of ``tahoe.cfg``. ``[sftpd]`` sections of ``tahoe.cfg``.
Storage Server Configuration 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`` many people as possible, put the empty string (so that ``private/convergence``
is a zero-length file). is a zero-length file).
Other files Other files
=========== ===========

View File

@ -1,4 +1,3 @@
import datetime, os.path, re, types, ConfigParser, tempfile import datetime, os.path, re, types, ConfigParser, tempfile
from base64 import b32decode, b32encode from base64 import b32decode, b32encode
@ -61,7 +60,6 @@ class Node(service.MultiService):
# creates self.config, populates from distinct files if necessary # creates self.config, populates from distinct files if necessary
self.read_config() self.read_config()
nickname_utf8 = self.get_config("node", "nickname", "<unspecified>") nickname_utf8 = self.get_config("node", "nickname", "<unspecified>")
self.nickname = nickname_utf8.decode("utf-8") self.nickname = nickname_utf8.decode("utf-8")
assert type(self.nickname) is unicode assert type(self.nickname) is unicode
@ -344,4 +342,3 @@ class Node(service.MultiService):
def add_service(self, s): def add_service(self, s):
s.setServiceParent(self) s.setServiceParent(self)
return s return s

View File

@ -336,7 +336,6 @@ class LoggingServiceParent(service.MultiService):
def log(self, *args, **kwargs): def log(self, *args, **kwargs):
return log.msg(*args, **kwargs) return log.msg(*args, **kwargs)
class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin): class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
# SystemTestMixin tests tend to be a lot of work, and we have a few # SystemTestMixin tests tend to be a lot of work, and we have a few

View File

@ -1,4 +1,3 @@
import os import os
from twisted.trial import unittest from twisted.trial import unittest
from twisted.application import service from twisted.application import service

View File

@ -1,4 +1,3 @@
from twisted.trial import unittest from twisted.trial import unittest
from twisted.python import usage, runtime from twisted.python import usage, runtime