commit 284797ace4cf0b8e4469454b65809fc66c7ae1d2 Author: Damian Johnson <atagar@torproject.org> Date: Fri Feb 1 06:57:54 2013 -0800 Pydoc missing version from descriptor type listing The 'network-status-microdesc-consensus-3' listing was missing the '1.0'. --- stem/descriptor/__init__.py | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 788b442..0a7ee07 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -64,24 +64,24 @@ def parse_file(descriptor_file, descriptor_type = None, path = None, validate = Descriptor types include the following, including further minor versions (ie. if we support 1.0 then we also support 1.1 and above)... - ===================================== ===== - Descriptor Type Class - ===================================== ===== - server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.RelayDescriptor` - extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor` - directory 1.0 **unsupported** - network-status-2 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV2` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV2`) - dir-key-certificate-3 1.0 :class:`~stem.descriptor.networkstatus.KeyCertificate` - network-status-consensus-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) - network-status-vote-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) - network-status-microdesc-consensus-3 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) - bridge-network-status 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.BridgeNetworkStatusDocument`) - bridge-server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` - bridge-extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor` - torperf 1.0 **unsupported** - bridge-pool-assignment 1.0 **unsupported** - tordnsel 1.0 **unsupported** - ===================================== ===== + ========================================= ===== + Descriptor Type Class + ========================================= ===== + server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.RelayDescriptor` + extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor` + directory 1.0 **unsupported** + network-status-2 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV2` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV2`) + dir-key-certificate-3 1.0 :class:`~stem.descriptor.networkstatus.KeyCertificate` + network-status-consensus-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) + network-status-vote-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) + network-status-microdesc-consensus-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) + bridge-network-status 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.BridgeNetworkStatusDocument`) + bridge-server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` + bridge-extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor` + torperf 1.0 **unsupported** + bridge-pool-assignment 1.0 **unsupported** + tordnsel 1.0 **unsupported** + ========================================= ===== If you're using **python 3** then beware of the open() function's universal newline translation. By default open() converts all common line endings (NL,