[tor-commits] [stem/master] Bump version collector module is getting added

[atagar at torproject.org]

commit 234b4916e9ef4cc640fbaba0b49b80558f76aacc
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Jun 15 16:02:29 2019 -0700

    Bump version collector module is getting added
    
    Ooph! Just realized I began a collector branch way back in December 2017.
    Rebased atop our present master.
    
    Stem 1.7 was already released, 1.8 is now the next upcoming version.
---
 stem/descriptor/collector.py       | 8 ++++----
 test/integ/descriptor/collector.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stem/descriptor/collector.py b/stem/descriptor/collector.py
index 2360d827..21a774e9 100644
--- a/stem/descriptor/collector.py
+++ b/stem/descriptor/collector.py
@@ -1,4 +1,4 @@
-# Copyright 2017, Damian Johnson and The Tor Project
+# Copyright 2017-2019, Damian Johnson and The Tor Project
 # See LICENSE for licensing information
 
 """
@@ -23,7 +23,7 @@ With this you can either download and read directly from CollecTor...
 
   for desc in collector.get_server_descriptors(start = yesterday):
     if desc.exit_policy.is_exiting_allowed():
-      print '  %s (%s)' % (desc.nickname, desc.fingerprint)
+      print('  %s (%s)' % (desc.nickname, desc.fingerprint))
 
 ... or download the descriptors to disk and read them later.
 
@@ -45,9 +45,9 @@ With this you can either download and read directly from CollecTor...
 
   for desc in reader:
     if desc.exit_policy.is_exiting_allowed():
-      print '  %s (%s)' % (desc.nickname, desc.fingerprint)
+      print('  %s (%s)' % (desc.nickname, desc.fingerprint))
 
-.. versionadded:: 1.7.0
+.. versionadded:: 1.8.0
 """
 
 import io
diff --git a/test/integ/descriptor/collector.py b/test/integ/descriptor/collector.py
index 3233f2e5..1af329a5 100644
--- a/test/integ/descriptor/collector.py
+++ b/test/integ/descriptor/collector.py
@@ -38,4 +38,4 @@ class TestCollector(unittest.TestCase):
     index = collector.index()
 
     self.assertEqual('https://collector.torproject.org', index['path'])
-    self.assertEqual(['archive', 'recent'], [entry['path'] for entry in index['directories']])
+    self.assertEqual(['archive', 'contrib', 'recent'], [entry['path'] for entry in index['directories']])