blob: 45798c1d618efa18d1fc92112488c769e26afd65 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Date: Tue, 6 Aug 2019 12:50:24 -0700
Subject: [PATCH] more Python 3 compatibility (#1782)
---
test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
test/test_rosmaster/test/nodes/testMaster | 2 +-
test/test_rosmaster/test/nodes/testSlave | 2 +-
test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
tools/rosgraph/test/test_roslogging.py | 5 ++++-
tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
7 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/tools/rosgraph/test/test_roslogging.py b/tools/rosgraph/test/test_roslogging.py
index f9e618f87..ca38c80e8 100644
--- a/tools/rosgraph/test/test_roslogging.py
+++ b/tools/rosgraph/test/test_roslogging.py
@@ -32,7 +32,10 @@
import logging
import os
-from StringIO import StringIO
+try:
+ from cStringIO import StringIO
+except ImportError:
+ from io import StringIO
import sys
import re
diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
index 62051638a..4ac4f8291 100644
--- a/tools/rosgraph/test/test_roslogging_user_logger.py
+++ b/tools/rosgraph/test/test_roslogging_user_logger.py
@@ -38,7 +38,10 @@
import logging
import os
-from StringIO import StringIO
+try:
+ from cStringIO import StringIO
+except ImportError:
+ from io import StringIO
import sys
from nose.tools import assert_regexp_matches
|
GitWeb
