Examples should prefer local pyelftools to installed one

diff --git a/examples/dwarf_decode_address.py b/examples/dwarf_decode_address.py
index 4b9ecdc3f5b8679a146270b65e21401721681ba2..55b31c7dfbb05ae909d79ff02f6f3eafbe3d5397 100644 (file)
--- a/examples/dwarf_decode_address.py
+++ b/examples/dwarf_decode_address.py
@@ -10,12 +10,9 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
 
 from elftools.common.py3compat import maxint, bytes2str
 from elftools.elf.elffile import ELFFile

diff --git a/examples/dwarf_die_tree.py b/examples/dwarf_die_tree.py
index 66280e66cc7b7fa4a0231b2bed0214edfa9089b0..9dcb6b658ce49dca3e0f9d3da08dbc9f2e2645c0 100644 (file)
--- a/examples/dwarf_die_tree.py
+++ b/examples/dwarf_die_tree.py
@@ -10,12 +10,9 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
 
 from elftools.common.py3compat import bytes2str
 from elftools.elf.elffile import ELFFile

diff --git a/examples/dwarf_location_lists.py b/examples/dwarf_location_lists.py
index 308dbe6e3575bc7bdd5e8e21c61b729c3787ddf3..d8ee1e97ea5be0272487362561ff3328da9e297d 100644 (file)
--- a/examples/dwarf_location_lists.py
+++ b/examples/dwarf_location_lists.py
@@ -10,12 +10,10 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
+
 
 from elftools.common.py3compat import itervalues
 from elftools.elf.elffile import ELFFile

diff --git a/examples/dwarf_range_lists.py b/examples/dwarf_range_lists.py
index 63fd6c7e6c42a962cb902a23c9dd79786eddcb66..fced6a6a1b36a83f8c23cacbfc8f1199c2a97f9f 100644 (file)
--- a/examples/dwarf_range_lists.py
+++ b/examples/dwarf_range_lists.py
@@ -10,12 +10,9 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
 
 from elftools.common.py3compat import itervalues
 from elftools.elf.elffile import ELFFile

diff --git a/examples/elf_low_high_api.py b/examples/elf_low_high_api.py
index b06b9e629f5429d9c6c2ae27ca57db6f1e60e2ab..e2d7f495bd745dfe277408f0d62f134d893edf1a 100644 (file)
--- a/examples/elf_low_high_api.py
+++ b/examples/elf_low_high_api.py
@@ -11,12 +11,9 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
 
 from elftools.common.py3compat import bytes2str
 from elftools.elf.elffile import ELFFile

diff --git a/examples/elf_relocations.py b/examples/elf_relocations.py
index 540f4774a9b371c9140783ddc5b008526c4d4835..008626619f53b5eb2548698adc60804df9d9f548 100644 (file)
--- a/examples/elf_relocations.py
+++ b/examples/elf_relocations.py
@@ -10,12 +10,10 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
+
 
 from elftools.common.py3compat import bytes2str
 from elftools.elf.elffile import ELFFile

diff --git a/examples/elf_show_debug_sections.py b/examples/elf_show_debug_sections.py
index 8ffe8adf8c6ee2c13c5d8a8ab2aa4145f18f8381..4e4da61e259056edf6eebf6c287199592c992678 100644 (file)
--- a/examples/elf_show_debug_sections.py
+++ b/examples/elf_show_debug_sections.py
@@ -9,12 +9,9 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
 
 from elftools.common.py3compat import bytes2str
 from elftools.elf.elffile import ELFFile

diff --git a/examples/elfclass_address_size.py b/examples/elfclass_address_size.py
index e6448a60816e64160147ca89420cc9fd0f770133..ac2bfaadcc3e728249faca14d85c8f0cf9e4523b 100644 (file)
--- a/examples/elfclass_address_size.py
+++ b/examples/elfclass_address_size.py
@@ -10,12 +10,9 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
 
 from elftools.elf.elffile import ELFFile
 

diff --git a/examples/examine_dwarf_info.py b/examples/examine_dwarf_info.py
index 45cdc67ef77953aa419b3e4bf20afd89d4bd9e39..1aa28c60e204ce317547e34979d62fcc209bb89f 100644 (file)
--- a/examples/examine_dwarf_info.py
+++ b/examples/examine_dwarf_info.py
@@ -9,12 +9,9 @@
 from __future__ import print_function
 import sys
 
-# If elftools is not installed, maybe we're running from the root or examples
-# dir of the source distribution
-try:
-    import elftools
-except ImportError:
-    sys.path[0:0] = ['.', '..']
+# If pyelftools is not installed, the example can also run from the root or
+# examples/ dir of the source distribution.
+sys.path[0:0] = ['.', '..']
 
 from elftools.common.py3compat import bytes2str
 from elftools.elf.elffile import ELFFile