commit cba98e26f16214925f7f5e6d61b51767da32b66e Author: Ravi Chandra Padmala neenaoffline@gmail.com Date: Tue Aug 7 21:24:30 2012 +0530

Fix incorrect stem.descriptor.networkstatus import --- stem/descriptor/__init__.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index f5da97a..8193380 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -48,7 +48,7 @@ def parse_file(path, descriptor_file):

import stem.descriptor.server_descriptor import stem.descriptor.extrainfo_descriptor - import stem.descriptor.networkstatus_descriptor + import stem.descriptor.networkstatus

# The tor descriptor specifications do not provide a reliable method for # identifying a descriptor file's type and version so we need to guess @@ -98,7 +98,7 @@ def parse_file(path, descriptor_file):

desc = stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor(descriptor_file.read()) elif desc_type in ("network-status-consensus-3", "network-status-vote-3") and major_version == 1: - desc = stem.descriptor.networkstatus_descriptor.NetworkStatusDocument(descriptor_file.read()) + desc = stem.descriptor.networkstatus.NetworkStatusDocument(descriptor_file.read()) for desc in desc.router_descriptors: desc._set_path(path) yield desc