X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fdata%2Fprocessing%2Fccn%2Fparser.py;h=7d35d9e39204c089cee87495433808a04f43d58d;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=f6452f490380b6e4de2f79cd97530874e7b2b69c;hpb=a55b5cf0818ced6ab8dc3e88fad7f6616675e826;p=nepi.git

diff --git a/src/nepi/data/processing/ccn/parser.py b/src/nepi/data/processing/ccn/parser.py
index f6452f49..7d35d9e3 100644
--- a/src/nepi/data/processing/ccn/parser.py
+++ b/src/nepi/data/processing/ccn/parser.py
@@ -6,9 +6,8 @@
 #    Copyright (C) 2014 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,6 +40,8 @@
 #                        \ nid3.log
 #
 
+from __future__ import print_function
+
 import collections
 import functools
 import networkx
@@ -130,7 +131,7 @@ def parse_file(filename):
         try:
             size = int((cols[6]).replace('(',''))
         except:
-            print "interest_expiry without face id!", line
+            print("interest_expiry without face id!", line)
             continue
 
         # If no external IP address was identified for this face
@@ -387,7 +388,7 @@ def process_content_history_logs(logs_dir, graph, parse_ping_logs = False):
         graph = annotate_cn_graph(logs_dir, graph, 
                 parse_ping_logs = parse_ping_logs)
     except:
-        print "Skipping: Error parsing ccnd logs", logs_dir
+        print("Skipping: Error parsing ccnd logs", logs_dir)
         raise
 
     source = ccn_consumers(graph)[0]
@@ -403,7 +404,7 @@ def process_content_history_logs(logs_dir, graph, parse_ping_logs = False):
         interest_count,
         content_count) = process_content_history(graph)
     except:
-        print "Skipping: Error processing ccn data", logs_dir
+        print("Skipping: Error processing ccn data", logs_dir)
         raise
 
     return (graph,