[tor-commits] [stem/master] Python 3 lru_cache isn't a collections annotation

[atagar at torproject.org]

commit 677ee1570cc1378b8abadb4071627ff53510cb8a
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Oct 12 19:23:04 2013 -0700

    Python 3 lru_cache isn't a collections annotation
    
    Oops, it's in functools, not collections.
---
 stem/descriptor/extrainfo_descriptor.py |    2 +-
 stem/descriptor/microdescriptor.py      |    2 +-
 stem/descriptor/server_descriptor.py    |    2 +-
 stem/exit_policy.py                     |    2 +-
 stem/prereq.py                          |    2 +-
 stem/util/proc.py                       |    2 +-
 stem/version.py                         |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py
index 0d50f75..b13efff 100644
--- a/stem/descriptor/extrainfo_descriptor.py
+++ b/stem/descriptor/extrainfo_descriptor.py
@@ -84,7 +84,7 @@ from stem.descriptor import (
 
 try:
   # added in python 3.2
-  from collections import lru_cache
+  from functools import lru_cache
 except ImportError:
   from stem.util.lru_cache import lru_cache
 
diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py
index c48419a..1f9e8cb 100644
--- a/stem/descriptor/microdescriptor.py
+++ b/stem/descriptor/microdescriptor.py
@@ -77,7 +77,7 @@ from stem.descriptor import (
 
 try:
   # added in python 3.2
-  from collections import lru_cache
+  from functools import lru_cache
 except ImportError:
   from stem.util.lru_cache import lru_cache
 
diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py
index 51b382f..160dab7 100644
--- a/stem/descriptor/server_descriptor.py
+++ b/stem/descriptor/server_descriptor.py
@@ -54,7 +54,7 @@ from stem.descriptor import (
 
 try:
   # added in python 3.2
-  from collections import lru_cache
+  from functools import lru_cache
 except ImportError:
   from stem.util.lru_cache import lru_cache
 
diff --git a/stem/exit_policy.py b/stem/exit_policy.py
index a00665e..9366a54 100644
--- a/stem/exit_policy.py
+++ b/stem/exit_policy.py
@@ -65,7 +65,7 @@ import stem.util.str_tools
 
 try:
   # added in python 3.2
-  from collections import lru_cache
+  from functools import lru_cache
 except ImportError:
   from stem.util.lru_cache import lru_cache
 
diff --git a/stem/prereq.py b/stem/prereq.py
index 22b5819..df2e10d 100644
--- a/stem/prereq.py
+++ b/stem/prereq.py
@@ -24,7 +24,7 @@ import sys
 
 try:
   # added in python 3.2
-  from collections import lru_cache
+  from functools import lru_cache
 except ImportError:
   from stem.util.lru_cache import lru_cache
 
diff --git a/stem/util/proc.py b/stem/util/proc.py
index fbff14c..95e75de 100644
--- a/stem/util/proc.py
+++ b/stem/util/proc.py
@@ -55,7 +55,7 @@ from stem.util import log
 
 try:
   # added in python 3.2
-  from collections import lru_cache
+  from functools import lru_cache
 except ImportError:
   from stem.util.lru_cache import lru_cache
 
diff --git a/stem/version.py b/stem/version.py
index bf41898..eca03cf 100644
--- a/stem/version.py
+++ b/stem/version.py
@@ -64,7 +64,7 @@ import stem.util.system
 
 try:
   # added in python 3.2
-  from collections import lru_cache
+  from functools import lru_cache
 except ImportError:
   from stem.util.lru_cache import lru_cache