moving stuff around

diff --git a/elftools/common/utils.py b/elftools/common/utils.py
index 716bebd19bbd7c1d9e4aab94f3ceb15d99d773c7..230ba96c387248016835091fc425825ebb8a1037 100644 (file)
--- a/elftools/common/utils.py
+++ b/elftools/common/utils.py
@@ -6,7 +6,7 @@
 # Eli Bendersky (eliben@gmail.com)\r
 # This code is in the public domain\r
 #-------------------------------------------------------------------------------\r
-from .exceptions import ELFParseError\r
+from .exceptions import ELFParseError, ELFError\r
 \r
 \r
 def struct_parse(struct, stream, stream_pos=None):\r
@@ -23,3 +23,10 @@ def struct_parse(struct, stream, stream_pos=None):
     except ConstructError as e:\r
         raise ELFParseError(e.message)\r
     \r
+\r
+def elf_assert(cond, msg=''):
+    """ Assert that cond is True, otherwise raise ELFError(msg)\r
+    """\r
+    if not cond:\r
+        raise ELFError(msg)\r
+\r

diff --git a/elftools/elf/elffile.py b/elftools/elf/elffile.py
index 045e1c4f2a13cb6afea4019165f6c9eadcb99b3a..6f2e7235417820adb2172537d9e08be9b5e2b2bc 100644 (file)
--- a/elftools/elf/elffile.py
+++ b/elftools/elf/elffile.py
@@ -7,7 +7,7 @@
 # This code is in the public domain\r
 #-------------------------------------------------------------------------------\r
 from ..common.exceptions import ELFError\r
-from ..common.utils import struct_parse\r
+from ..common.utils import struct_parse, elf_assert\r
 from ..construct import ConstructError\r
 from .structs import ELFStructs\r
 from .sections import Section, StringTableSection, SymbolTableSection\r
@@ -87,7 +87,7 @@ class ELFFile(object):
         #\r
         self.stream.seek(0)\r
         magic = self.stream.read(4)\r
-        self._assert(magic == '\x7fELF', 'Magic number does not match')\r
+        elf_assert(magic == '\x7fELF', 'Magic number does not match')\r
         \r
         ei_class = self.stream.read(1)\r
         if ei_class == '\x01':\r
@@ -174,10 +174,4 @@ class ELFFile(object):
             of this object.
         """\r
         return struct_parse(self.structs.Elf_Ehdr, self.stream, stream_pos=0)\r
-    \r
-    def _assert(self, cond, msg=''):
-        """ Assert that cond is True, otherwise raise ELFError(msg)
-        """\r
-        if not cond:\r
-            raise ELFError(msg)\r
 \r

diff --git a/elftools/elf/sections.py b/elftools/elf/sections.py
index 931095f8a7a50faaf14fc63ec8deeb53a33ed84c..6accf11fdea64c30f053696b2672422dc90bbd95 100644 (file)
--- a/elftools/elf/sections.py
+++ b/elftools/elf/sections.py
@@ -7,7 +7,7 @@
 # This code is in the public domain\r
 #-------------------------------------------------------------------------------\r
 from ..construct import CString\r
-from ..common.utils import struct_parse\r
+from ..common.utils import struct_parse, elf_assert\r
 \r
 \r
 class Section(object):\r
@@ -58,5 +58,3 @@ class SymbolTableSection(Section):
     def __init__(self, header, name, stream, stringtable):\r
         super(SymbolTableSection, self).__init__(header, name, stream)
         self.stringtable = stringtable\r
-    \r
-\r