[tor-commits] [stem/master] Cleaning up minor import issues

[atagar at torproject.org]

commit ab8fe646817b585ceda7c6062c3294556f8f71cc
Author: Damian Johnson <atagar at torproject.org>
Date:   Fri Mar 23 20:23:17 2012 -0700

    Cleaning up minor import issues
---
 stem/__init__.py            |    2 +-
 stem/descriptor/__init__.py |    4 ++--
 stem/descriptor/reader.py   |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/stem/__init__.py b/stem/__init__.py
index 8a914fa..ceb137f 100644
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@ -2,5 +2,5 @@
 Library for working with the tor process.
 """
 
-__all__ = ["connection", "control", "process", "socket", "version"]
+__all__ = ["descriptor", "util", "connection", "control", "process", "socket", "version"]
 
diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index 96f1bf5..7b05963 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -1,8 +1,8 @@
 """
-Utilities for parsing and processing descriptor data.
+Package for parsing and processing descriptor data.
 """
 
-__all__ = ["descriptor", "reader", "server_descriptor"]
+__all__ = ["descriptor", "reader", "server_descriptor", "parse_descriptors", "Descriptor"]
 
 import os
 
diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py
index 3b6f5fd..4f043bc 100644
--- a/stem/descriptor/reader.py
+++ b/stem/descriptor/reader.py
@@ -70,7 +70,7 @@ import threading
 import mimetypes
 import Queue
 
-import stem.descriptor.descriptor
+import stem.descriptor
 
 # flag to indicate when the reader thread is out of descriptor files to read
 FINISHED = "DONE"
@@ -365,7 +365,7 @@ class DescriptorReader:
   def _handle_descriptor_file(self, target):
     try:
       with open(target) as target_file:
-        for desc in stem.descriptor.descriptor.parse_descriptors(target, target_file):
+        for desc in stem.descriptor.parse_descriptors(target, target_file):
           self._enqueue_descriptor(desc)
           self._iter_notice.set()
     except TypeError, exc:
@@ -380,7 +380,7 @@ class DescriptorReader:
           if tar_entry.isfile():
             entry = tar_file.extractfile(tar_entry)
             
-            for desc in stem.descriptor.descriptor.parse_descriptors(target, entry):
+            for desc in stem.descriptor.parse_descriptors(target, entry):
               self._enqueue_descriptor(desc)
               self._iter_notice.set()