Merge branch 'code-style'

linkpred/evaluation/scoresheet.py

@@ -80,7 +80,7 @@ def to_record(key, value, delimiter='\t'):
         return u"{}{}{}\n".format(key, delimiter, value)
 
     @classmethod
-    def from_file(cls, fname, delimiter='\t', encoding='utf-8', **kwargs):
+    def from_file(cls, fname, delimiter='\t', encoding='utf-8'):
         """Create new instance from CSV file *fname*"""
         d = cls()
         with open(fname, "rb") as fh:
@@ -89,7 +89,7 @@ def from_file(cls, fname, delimiter='\t', encoding='utf-8', **kwargs):
                 d[key] = score
         return d
 
-    def to_file(self, fname, delimiter='\t', encoding='utf-8', **kwargs):
+    def to_file(self, fname, delimiter='\t', encoding='utf-8'):
         """Save to CSV file *fname*"""
         with open(fname, "wb") as fh:
             for key, score in self.ranked_items():

linkpred/predictors/base.py

@@ -31,7 +31,7 @@ class Predictor(object):
 
     """
 
-    def __init__(self, G, eligible=None, excluded=[]):
+    def __init__(self, G, eligible=None, excluded=None):
         """
         Initialize predictor
 
@@ -45,7 +45,7 @@ def __init__(self, G, eligible=None, excluded=[]):
             and non-eligible nodes. We only try to predict links between
             two eligible nodes.
 
-        excluded : iterable
+        excluded : iterable or None
             A list or iterable of node pairs that should be excluded (i.e., not
             predicted). This is useful to, for instance, make sure that we only
             predict new links that are not currently in G.
@@ -54,7 +54,7 @@ def __init__(self, G, eligible=None, excluded=[]):
         self.G = G
         self.eligible_attr = eligible
         self.name = self.__class__.__name__
-        self.excluded = excluded
+        self.excluded = [] if excluded is None else excluded
 
         # Add a decorator to predict(), to do the necessary postprocessing for
         # filtering out links if `excluded` is not empty. We do this in

scripts/linkpred

@@ -38,7 +38,20 @@ from linkpred.cli import get_config
 from linkpred.linkpred import LinkPred
 
 
+def setup_logger():
+    import logging
+
+    logger = logging.getLogger('linkpred')
+    streamhandler = logging.StreamHandler(sys.stdout)
+    formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s",
+                                  "%H:%M:%S")
+    streamhandler.setFormatter(formatter)
+    logger.setLevel(logging.INFO)
+    logger.addHandler(streamhandler)
+
+
 def main():
+    setup_logger()
     config = get_config()
     linkpred = LinkPred(config)
     linkpred.preprocess()