Imported Upstream version 0.3

[pysam.git] / pysam / __init__.py

diff --git a/pysam/__init__.py b/pysam/__init__.py
index 3062753f295cee7d22ba4e86689063905bb01f0a..9f257c210eca878b0f0039b40f724f3482937284 100644 (file)
--- a/pysam/__init__.py
+++ b/pysam/__init__.py
@@ -1,4 +1,7 @@
 from csamtools import *
+from ctabix import *
+import csamtools
+import ctabix
 import Pileup
 import sys
 import os
@@ -50,7 +53,9 @@ class SamtoolsDispatcher(object):
         # Note that there is sometimes output on stderr that is not an error,
         # for example: [sam_header_read2] 2 sequences loaded.
         # Ignore messages like these
-        stderr = [ x for x in stderr if not x.startswith( "[sam_header_read2]" ) ]
+        stderr = [ x for x in stderr \
+                       if not x.startswith( "[sam_header_read2]" ) or \
+                       x.startswith("[bam_index_load]") ]
         if stderr: raise SamtoolsError( "\n".join( stderr ) )
 
         # call parser for stdout:
@@ -96,6 +101,9 @@ for key, options in SAMTOOLS_DISPATCH.iteritems():
     globals()[key] = SamtoolsDispatcher(cmd, parser)
 
 # hack to export all the symbols from csamtools
-__all__ = csamtools.__all__ + [ "SamtoolsError", "SamtoolsDispatcher" ] + list(SAMTOOLS_DISPATCH) +\
+__all__ = csamtools.__all__ + \
+    ctabix.__all__ + \
+    [ "SamtoolsError", "SamtoolsDispatcher" ] + list(SAMTOOLS_DISPATCH) +\
     ["Pileup",] 
 
+from version import __version__, __samtools_version__