summarylogtreecommitdiffstats
path: root/execution-controllers-python3.patch
blob: 320687e770b38c9dd977b6997faefa4577c16349 (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
--- a/catkin_tools/execution/controllers.py
+++ b/catkin_tools/execution/controllers.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import division
+
 try:
     # Python3
     from queue import Empty
@@ -284,7 +286,7 @@
         ])

         # Calculate the number of columns
-        number_of_columns = (terminal_width() / max_column_len) or 1
+        number_of_columns = (terminal_width() // max_column_len) or 1

         # Construct different categories of jobs (jid -> output template)
         successfuls = {}
@@ -319,7 +319,7 @@
             wide_log(clr("[{}] Successful {}:").format(self.label, self.jobs_label))
             wide_log("")
             print_items_in_columns(
-                sorted(successfuls.items() + ignoreds.items()),
+                sorted(list(successfuls.items()) + list(ignoreds.items())),
                 number_of_columns)
         else:
             wide_log("")