[tor-commits] [stem/master] Typo corrections for descriptor changes

atagar at torproject.org atagar at torproject.org
Thu Mar 29 03:20:11 UTC 2012


commit 222d58a9bad7e1675f70002fb00b2a9b962cfe63
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Mar 28 20:19:03 2012 -0700

    Typo corrections for descriptor changes
    
    Patch by karsten to fix numerous misspellings.
---
 stem/descriptor/__init__.py          |    2 +-
 stem/descriptor/reader.py            |    6 +++---
 stem/descriptor/server_descriptor.py |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index 325ac4b..21f40c2 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -45,7 +45,7 @@ def parse_file(path, descriptor_file):
       desc._set_path(path)
       yield desc
   else:
-    # unrecognized descritor type
+    # unrecognized descriptor type
     raise TypeError("Unable to determine the descriptor's type. filename: '%s', first line: '%s'" % (filename, first_line))
 
 class Descriptor:
diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py
index 4683744..c81fe6e 100644
--- a/stem/descriptor/reader.py
+++ b/stem/descriptor/reader.py
@@ -193,7 +193,7 @@ class DescriptorReader:
   
   Arguments:
     targets (list)      - paths for files or directories to be read from
-    follow_links (bool) - determines if we'll follow symlinks when transversing
+    follow_links (bool) - determines if we'll follow symlinks when traversing
                           directories
     buffer_size (int)   - descriptors we'll buffer before waiting for some to
                           be read, this is unbounded if zero
@@ -323,7 +323,7 @@ class DescriptorReader:
           # this can take a while if, say, we're including the root directory
           if self._is_stopped.is_set(): break
       else:
-        # This is a file. Register it's last modified timestamp and check if
+        # This is a file. Register its last modified timestamp and check if
         # it's a file that we should skip.
         
         last_modified = int(os.stat(target).st_mtime)
@@ -396,7 +396,7 @@ class DescriptorReader:
       self._notify_skip_listeners(target, ReadFailed(exc))
   
   def _enqueue_descriptor(self, descriptor):
-    # blocks until their is either room for the descriptor or we're stopped
+    # blocks until there is either room for the descriptor or we're stopped
     
     while True:
       try:
diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py
index a82a657..3460740 100644
--- a/stem/descriptor/server_descriptor.py
+++ b/stem/descriptor/server_descriptor.py
@@ -153,7 +153,7 @@ def _read_until_keyword(keyword, descriptor_file, inclusive = False):
   
   return content
 
-def _get_psudo_pgp_block(remaining_contents):
+def _get_pseudo_pgp_block(remaining_contents):
   """
   Checks if given contents begins with a pseudo-Open-PGP-style block and, if
   so, pops it off and provides it back to the caller.
@@ -335,7 +335,7 @@ class ServerDescriptorV3(stem.descriptor.Descriptor):
       keyword, value = line_match.groups()
       
       try:
-        block_contents = _get_psudo_pgp_block(remaining_contents)
+        block_contents = _get_pseudo_pgp_block(remaining_contents)
       except ValueError, exc:
         if not validate: continue
         raise exc
@@ -429,7 +429,7 @@ class ServerDescriptorV3(stem.descriptor.Descriptor):
         # version followed by the os like the following...
         # platform Tor 0.2.2.35 (git-73ff13ab3cc9570d) on Linux x86_64
         #
-        # There's no guerentee that we'll be able to pick these out the
+        # There's no guarantee that we'll be able to pick these out the
         # version, but might as well try to save our caller the effot.
         
         platform_match = re.match("^Tor (\S*).* on (.*)$", self.platform)
@@ -479,7 +479,7 @@ class ServerDescriptorV3(stem.descriptor.Descriptor):
         # fingerprint
         
         if validate and not stem.util.tor_tools.is_valid_fingerprint(value):
-          raise ValueError("Hidden service digests should consist of fourty hex digits: %s" % value)
+          raise ValueError("Extra-info digests should consist of fourty hex digits: %s" % value)
         
         self.extra_info_digest = value
       elif keyword == "hidden-service-dir":



More information about the tor-commits mailing list