Merge pull request #698 from ged-lab/fix/delete-callback

remove unused callback code
dib-lab · Feb 23, 2015 · 28523f3 · 28523f3
2 parents 0c8bc76 + cc176dd
commit 28523f3
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 351 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-23  Michael R. Crusoe  <mcrusoe@msu.edu>
+
+   * khmer/{__init__.py,_khmermodule.cc},lib/{hashbits.cc,hashbits.hh,
+   hashtable,tests/test_{c_wrapper,read_parsers}.py: remove unused callback
+   functionality
+
 2015-02-23  Michael R. Crusoe  <mcrusoe@msu.edu>
 
    * setup.py: point to the latest screed release candidate to work around

diff --git a/khmer/__init__.py b/khmer/__init__.py
@@ -10,7 +10,6 @@
 
 from khmer._khmer import _new_counting_hash
 from khmer._khmer import _new_hashbits
-from khmer._khmer import set_reporting_callback
 from khmer._khmer import _LabelHash
 from khmer._khmer import _Hashbits
 from khmer._khmer import _HLLCounter
@@ -100,16 +99,6 @@ def load_counting_hash(filename):
     return hashtable
 
 
-def _default_reporting_callback(info, n_reads, other):
-    print '...', info, n_reads, other
-
-
-def reset_reporting_callback():
-    set_reporting_callback(_default_reporting_callback)
-
-reset_reporting_callback()
-
-
 def extract_hashbits_info(filename):
     """Open the given hashbits file and return a tuple of information.