From 774cf24bfddb7726c4801627c93d69b9e4f774f5 Mon Sep 17 00:00:00 2001
From: phill-ridout <phill.ridout@googlemail.com>
Date: Sun, 21 Apr 2013 20:15:49 +0100
Subject: [PATCH] renamed type attribute

---
 openlp/plugins/songs/lib/ewimport.py          | 26 +++++++++----------
 .../openlp_plugins/songs/test_ewimport.py     |  4 +--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index 4f8d7d970..287310cb3 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -50,7 +50,7 @@ NOTE_REGEX = re.compile(r'\(.*?\)')
 class FieldDescEntry:
     def __init__(self, name, field_type, size):
         self.name = name
-        self.type = field_type
+        self.field_type = field_type
         self.size = size
 
 
@@ -231,25 +231,25 @@ class EasyWorshipSongImport(SongImport):
         # Begin with empty field struct list
         fsl = ['>']
         for field_desc in field_descs:
-            if field_desc.type == 1:
+            if field_desc.field_type == 1:
                 # string
                 fsl.append('%ds' % field_desc.size)
-            elif field_desc.type == 3:
+            elif field_desc.field_type == 3:
                 # 16-bit int
                 fsl.append('H')
-            elif field_desc.type == 4:
+            elif field_desc.field_type == 4:
                 # 32-bit int
                 fsl.append('I')
-            elif field_desc.type == 9:
+            elif field_desc.field_type == 9:
                 # Logical
                 fsl.append('B')
-            elif field_desc.type == 0x0c:
+            elif field_desc.field_type == 0x0c:
                 # Memo
                 fsl.append('%ds' % field_desc.size)
-            elif field_desc.type == 0x0d:
+            elif field_desc.field_type == 0x0d:
                 # Blob
                 fsl.append('%ds' % field_desc.size)
-            elif field_desc.type == 0x15:
+            elif field_desc.field_type == 0x15:
                 # Timestamp
                 fsl.append('Q')
             else:
@@ -267,19 +267,19 @@ class EasyWorshipSongImport(SongImport):
         elif field == 0:
             return None
         # Format the field depending on the field type
-        if field_desc.type == 1:
+        if field_desc.field_type == 1:
             # string
             return field.rstrip('\0').decode(self.encoding)
-        elif field_desc.type == 3:
+        elif field_desc.field_type == 3:
             # 16-bit int
             return field ^ 0x8000
-        elif field_desc.type == 4:
+        elif field_desc.field_type == 4:
             # 32-bit int
             return field ^ 0x80000000
-        elif field_desc.type == 9:
+        elif field_desc.field_type == 9:
             # Logical
             return (field ^ 0x80 == 1)
-        elif field_desc.type == 0x0c or field_desc.type == 0x0d:
+        elif field_desc.field_type == 0x0c or field_desc.field_type == 0x0d:
             # Memo or Blob
             block_start, blob_size = struct.unpack_from('<II', field, len(field)-10)
             sub_block = block_start & 0xff
diff --git a/tests/functional/openlp_plugins/songs/test_ewimport.py b/tests/functional/openlp_plugins/songs/test_ewimport.py
index 3c91e3d7a..48caa7574 100644
--- a/tests/functional/openlp_plugins/songs/test_ewimport.py
+++ b/tests/functional/openlp_plugins/songs/test_ewimport.py
@@ -61,7 +61,7 @@ class EasyWorshipSongImportLogger(EasyWorshipSongImport):
 class TestFieldDesc:
     def __init__(self, name, field_type, size):
         self.name = name
-        self.type = field_type
+        self.field_type = field_type
         self.size = size
 
 TEST_DATA_ENCODING = u'cp1252'
@@ -102,7 +102,7 @@ class TestEasyWorshipSongImport(TestCase):
         # THEN:
         self.assertIsNotNone(field_desc_entry, u'Import should not be none')
         self.assertEquals(field_desc_entry.name, name, u'FieldDescEntry.name should be the same as the name argument')
-        self.assertEquals(field_desc_entry.type, field_type,
+        self.assertEquals(field_desc_entry.field_type, field_type,
             u'FieldDescEntry.type should be the same as the typeargument')
         self.assertEquals(field_desc_entry.size, size, u'FieldDescEntry.size should be the same as the size argument')