Blob Blame History Raw
diff --git a/breezy/bencode.py b/breezy/bencode.py
index 9079b26..7bea25a 100644
--- a/breezy/bencode.py
+++ b/breezy/bencode.py
@@ -20,13 +20,9 @@ from __future__ import absolute_import
 
 from . import osutils
 
-try:
-    from ._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
-except ImportError as e:
-    osutils.failed_to_load_extension(e)
-    from .util._bencode_py import (  # noqa: F401
-        bdecode,
-        bdecode_as_tuple,
-        bencode,
-        Bencached,
-        )
+from .util._bencode_py import (  # noqa: F401
+    bdecode,
+    bdecode_as_tuple,
+    bencode,
+    Bencached,
+    )
diff --git a/breezy/bzr/btree_index.py b/breezy/bzr/btree_index.py
index 340e44a..8cd24ba 100644
--- a/breezy/bzr/btree_index.py
+++ b/breezy/bzr/btree_index.py
@@ -1563,9 +1563,4 @@ class BTreeGraphIndex(object):
 
 _gcchk_factory = _LeafNode
 
-try:
-    from . import _btree_serializer_pyx as _btree_serializer
-    _gcchk_factory = _btree_serializer._parse_into_chk
-except ImportError as e:
-    osutils.failed_to_load_extension(e)
-    from . import _btree_serializer_py as _btree_serializer
+from . import _btree_serializer_py as _btree_serializer
diff --git a/breezy/bzr/chk_map.py b/breezy/bzr/chk_map.py
index 5890142..f6cdb74 100644
--- a/breezy/bzr/chk_map.py
+++ b/breezy/bzr/chk_map.py
@@ -1730,23 +1730,13 @@ def iter_interesting_nodes(store, interesting_root_keys,
     return iterator.process()
 
 
-try:
-    from ._chk_map_pyx import (
-        _bytes_to_text_key,
-        _search_key_16,
-        _search_key_255,
-        _deserialise_leaf_node,
-        _deserialise_internal_node,
-        )
-except ImportError as e:
-    osutils.failed_to_load_extension(e)
-    from ._chk_map_py import (
-        _bytes_to_text_key,
-        _search_key_16,
-        _search_key_255,
-        _deserialise_leaf_node,
-        _deserialise_internal_node,
-        )  # noqa: F401
+from ._chk_map_py import (
+    _bytes_to_text_key,
+    _search_key_16,
+    _search_key_255,
+    _deserialise_leaf_node,
+    _deserialise_internal_node,
+    )  # noqa: F401
 search_key_registry.register(b'hash-16-way', _search_key_16)
 search_key_registry.register(b'hash-255-way', _search_key_255)
 
diff --git a/breezy/bzr/dirstate.py b/breezy/bzr/dirstate.py
index 30de77d..4387354 100644
--- a/breezy/bzr/dirstate.py
+++ b/breezy/bzr/dirstate.py
@@ -4347,31 +4347,18 @@ class ProcessEntryPython(object):
         return dir_info
 
 
-# Try to load the compiled form if possible
-try:
-    from ._dirstate_helpers_pyx import (
-        _read_dirblocks,
-        bisect_dirblock,
-        _bisect_path_left,
-        _bisect_path_right,
-        lt_by_dirs,
-        pack_stat,
-        ProcessEntryC as _process_entry,
-        update_entry as update_entry,
-        )
-except ImportError as e:
-    osutils.failed_to_load_extension(e)
-    from ._dirstate_helpers_py import (
-        _read_dirblocks,
-        bisect_dirblock,
-        _bisect_path_left,
-        _bisect_path_right,
-        lt_by_dirs,
-        pack_stat,
-        )
-    # FIXME: It would be nice to be able to track moved lines so that the
-    # corresponding python code can be moved to the _dirstate_helpers_py
-    # module. I don't want to break the history for this important piece of
-    # code so I left the code here -- vila 20090622
-    update_entry = py_update_entry
-    _process_entry = ProcessEntryPython
+
+from ._dirstate_helpers_py import (
+    _read_dirblocks,
+    bisect_dirblock,
+    _bisect_path_left,
+    _bisect_path_right,
+    lt_by_dirs,
+    pack_stat,
+    )
+# FIXME: It would be nice to be able to track moved lines so that the
+# corresponding python code can be moved to the _dirstate_helpers_py
+# module. I don't want to break the history for this important piece of
+# code so I left the code here -- vila 20090622
+update_entry = py_update_entry
+_process_entry = ProcessEntryPython
diff --git a/breezy/static_tuple.py b/breezy/static_tuple.py
index d01117d..38c7bf1 100644
--- a/breezy/static_tuple.py
+++ b/breezy/static_tuple.py
@@ -20,12 +20,7 @@ from __future__ import absolute_import
 
 from . import debug
 
-try:
-    from ._static_tuple_c import StaticTuple
-except ImportError as e:
-    from . import osutils
-    osutils.failed_to_load_extension(e)
-    from ._static_tuple_py import StaticTuple
+from ._static_tuple_py import StaticTuple
 
 
 def expect_static_tuple(obj):
diff --git a/setup.py b/setup.py
index 2662fc7..de95aab 100755
--- a/setup.py
+++ b/setup.py
@@ -308,10 +308,7 @@ def add_cython_extension(module_name, libraries=None, extra_source=[]):
 
 
 add_cython_extension('breezy._simple_set_pyx')
-ext_modules.append(Extension('breezy._static_tuple_c',
-                             ['breezy/_static_tuple_c.c']))
 add_cython_extension('breezy._annotator_pyx')
-add_cython_extension('breezy._bencode_pyx')
 add_cython_extension('breezy._chunks_to_lines_pyx')
 add_cython_extension('breezy.bzr._groupcompress_pyx',
                      extra_source=['breezy/bzr/diff-delta.c'])
@@ -319,16 +316,11 @@ add_cython_extension('breezy.bzr._knit_load_data_pyx')
 add_cython_extension('breezy._known_graph_pyx')
 add_cython_extension('breezy._rio_pyx')
 if sys.platform == 'win32':
-    add_cython_extension('breezy.bzr._dirstate_helpers_pyx',
-                         libraries=['Ws2_32'])
     add_cython_extension('breezy._walkdirs_win32')
 else:
-    add_cython_extension('breezy.bzr._dirstate_helpers_pyx')
     add_cython_extension('breezy._readdir_pyx')
-add_cython_extension('breezy.bzr._chk_map_pyx')
 ext_modules.append(Extension('breezy._patiencediff_c',
                              ['breezy/_patiencediff_c.c']))
-add_cython_extension('breezy.bzr._btree_serializer_pyx')
 
 
 if unavailable_files: