[tor-commits] [stem/master] Using CollecTor for the @type annotations as well

[atagar at torproject.org]

commit 6a325a7d1eccd9c4f8a55d8664ab564c2ebe326a
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Jun 23 07:59:47 2014 -0700

    Using CollecTor for the @type annotations as well
    
    Karsten points out that the CollecTor actually does have all the @type
    annotationns. This drops our last reference to metrics.torproject.org.
---
 stem/control.py             |    2 +-
 stem/descriptor/__init__.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stem/control.py b/stem/control.py
index 30cb1b8..b8cff59 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -1252,7 +1252,7 @@ class Controller(BaseController):
 
     :param object default: response if the query fails
 
-    :returns: int with our process' pid
+    :returns: **int** for tor's pid
 
     :raises: **ValueError** if unable to determine the pid and no default was
       provided
diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index 887ab5b..7c6eede 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -130,7 +130,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen
     my_descriptor_file = open(descriptor_path, 'rb')
 
   :param str,file,tarfile descriptor_file: path or opened file with the descriptor contents
-  :param str descriptor_type: `descriptor type <https://metrics.torproject.org/formats.html#descriptortypes>`_, this is guessed if not provided
+  :param str descriptor_type: `descriptor type <https://collector.torproject.org/formats.html>`_, this is guessed if not provided
   :param bool validate: checks the validity of the descriptor's content if
     **True**, skips these checks otherwise
   :param stem.descriptor.__init__.DocumentHandler document_handler: method in