From cca166a4f5af37de36d05ac943de6fa095dd2b80 Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@allmydata.com> Date: Tue, 4 Dec 2007 11:45:20 -0700 Subject: [PATCH] rename dirnode2.py to dirnode.py --- src/allmydata/client.py | 2 +- src/allmydata/{dirnode2.py => dirnode.py} | 0 src/allmydata/test/test_mutable.py | 6 +++--- src/allmydata/test/test_web.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/allmydata/{dirnode2.py => dirnode.py} (100%) diff --git a/src/allmydata/client.py b/src/allmydata/client.py index 0503d5b6..6a30a208 100644 --- a/src/allmydata/client.py +++ b/src/allmydata/client.py @@ -18,7 +18,7 @@ from allmydata.control import ControlServer from allmydata.introducer import IntroducerClient from allmydata.util import hashutil, idlib, testutil, observer from allmydata.filenode import FileNode -from allmydata.dirnode2 import NewDirectoryNode +from allmydata.dirnode import NewDirectoryNode from allmydata.mutable import MutableFileNode from allmydata.interfaces import IURI, INewDirectoryURI, \ IReadonlyNewDirectoryURI, IFileURI, IMutableFileURI diff --git a/src/allmydata/dirnode2.py b/src/allmydata/dirnode.py similarity index 100% rename from src/allmydata/dirnode2.py rename to src/allmydata/dirnode.py diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py index 33194d6b..7d923334 100644 --- a/src/allmydata/test/test_mutable.py +++ b/src/allmydata/test/test_mutable.py @@ -3,8 +3,8 @@ import itertools, struct from twisted.trial import unittest from twisted.internet import defer from twisted.python import failure, log -from allmydata import mutable, uri, dirnode2, upload -from allmydata.dirnode2 import split_netstring +from allmydata import mutable, uri, dirnode, upload +from allmydata.dirnode import split_netstring from allmydata.util.hashutil import netstring, tagged_hash from allmydata.encode import NotEnoughPeersError from allmydata.interfaces import IURI, INewDirectoryURI, \ @@ -98,7 +98,7 @@ class FakePublish(mutable.Publish): return defer.succeed(answer) -class FakeNewDirectoryNode(dirnode2.NewDirectoryNode): +class FakeNewDirectoryNode(dirnode.NewDirectoryNode): filenode_class = FakeFilenode class FakeIntroducerClient: diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py index f089d4bd..40e4a6b5 100644 --- a/src/allmydata/test/test_web.py +++ b/src/allmydata/test/test_web.py @@ -6,7 +6,7 @@ from twisted.trial import unittest from twisted.internet import defer from twisted.web import client, error, http from twisted.python import failure, log -from allmydata import dirnode2, webish, interfaces, uri, provisioning, filenode +from allmydata import dirnode, webish, interfaces, uri, provisioning, filenode from allmydata.encode import NotEnoughPeersError from allmydata.util import fileutil import itertools @@ -112,7 +112,7 @@ def syncwrap(meth): return l[0] return _syncwrapped_meth -class FakeDirectoryNode(dirnode2.NewDirectoryNode): +class FakeDirectoryNode(dirnode.NewDirectoryNode): filenode_class = test_mutable.FakeFilenode @syncwrap -- 2.45.2