From b58875fe435e1fb7e44b5d60caa84dee87f2022c Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sun, 7 Dec 2008 08:20:08 -0700
Subject: [PATCH] mutable: rename mutable/node.py to mutable/filenode.py and
 mutable/repair.py to mutable/repairer.py To be more consistent with the
 immutable layout that I am working on.

---
 src/allmydata/client.py                          | 2 +-
 src/allmydata/dirnode.py                         | 2 +-
 src/allmydata/mutable/{node.py => filenode.py}   | 2 +-
 src/allmydata/mutable/{repair.py => repairer.py} | 0
 src/allmydata/test/test_filenode.py              | 2 +-
 src/allmydata/test/test_mutable.py               | 4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/allmydata/mutable/{node.py => filenode.py} (99%)
 rename src/allmydata/mutable/{repair.py => repairer.py} (100%)

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index ffbf9fe8..4583fcc2 100644
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -22,7 +22,7 @@ from allmydata.util import hashutil, base32, pollmixin, cachedir
 from allmydata.util.abbreviate import parse_abbreviated_size
 from allmydata.uri import LiteralFileURI
 from allmydata.dirnode import NewDirectoryNode
-from allmydata.mutable.node import MutableFileNode, MutableWatcher
+from allmydata.mutable.filenode import MutableFileNode, MutableWatcher
 from allmydata.stats import StatsProvider
 from allmydata.interfaces import IURI, INewDirectoryURI, IStatsProducer, \
      IReadonlyNewDirectoryURI, IFileURI, IMutableFileURI, RIStubClient
diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py
index 3caec6b4..7417a07e 100644
--- a/src/allmydata/dirnode.py
+++ b/src/allmydata/dirnode.py
@@ -5,7 +5,7 @@ from zope.interface import implements
 from twisted.internet import defer
 import simplejson
 from allmydata.mutable.common import NotMutableError
-from allmydata.mutable.node import MutableFileNode
+from allmydata.mutable.filenode import MutableFileNode
 from allmydata.interfaces import IMutableFileNode, IDirectoryNode,\
      IURI, IFileNode, IMutableFileURI, IFilesystemNode, \
      ExistingChildError, NoSuchChildError, ICheckable, IDeepCheckable
diff --git a/src/allmydata/mutable/node.py b/src/allmydata/mutable/filenode.py
similarity index 99%
rename from src/allmydata/mutable/node.py
rename to src/allmydata/mutable/filenode.py
index cfa823d8..882831b7 100644
--- a/src/allmydata/mutable/node.py
+++ b/src/allmydata/mutable/filenode.py
@@ -20,7 +20,7 @@ from common import MODE_READ, MODE_WRITE, UnrecoverableFileError, \
 from servermap import ServerMap, ServermapUpdater
 from retrieve import Retrieve
 from checker import MutableChecker, MutableCheckAndRepairer
-from repair import Repairer
+from repairer import Repairer
 
 
 class BackoffAgent:
diff --git a/src/allmydata/mutable/repair.py b/src/allmydata/mutable/repairer.py
similarity index 100%
rename from src/allmydata/mutable/repair.py
rename to src/allmydata/mutable/repairer.py
diff --git a/src/allmydata/test/test_filenode.py b/src/allmydata/test/test_filenode.py
index 025e76e6..46db7fcd 100644
--- a/src/allmydata/test/test_filenode.py
+++ b/src/allmydata/test/test_filenode.py
@@ -3,7 +3,7 @@ from twisted.trial import unittest
 from allmydata import uri
 from allmydata.monitor import Monitor
 from allmydata.immutable import filenode, download
-from allmydata.mutable.node import MutableFileNode
+from allmydata.mutable.filenode import MutableFileNode
 from allmydata.util import hashutil, cachedir
 from allmydata.test.common import download_to_data
 
diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py
index 055b4649..d2cc36a6 100644
--- a/src/allmydata/test/test_mutable.py
+++ b/src/allmydata/test/test_mutable.py
@@ -18,7 +18,7 @@ from foolscap.eventual import eventually, fireEventually
 from foolscap.logging import log
 import sha
 
-from allmydata.mutable.node import MutableFileNode, BackoffAgent
+from allmydata.mutable.filenode import MutableFileNode, BackoffAgent
 from allmydata.mutable.common import DictOfSets, ResponseCache, \
      MODE_CHECK, MODE_ANYTHING, MODE_WRITE, MODE_READ, \
      NeedMoreDataError, UnrecoverableFileError, UncoordinatedWriteError, \
@@ -27,7 +27,7 @@ from allmydata.mutable.retrieve import Retrieve
 from allmydata.mutable.publish import Publish
 from allmydata.mutable.servermap import ServerMap, ServermapUpdater
 from allmydata.mutable.layout import unpack_header, unpack_share
-from allmydata.mutable.repair import MustForceRepairError
+from allmydata.mutable.repairer import MustForceRepairError
 
 import common_util as testutil
 
-- 
2.45.2