From 6ba3e3f20d7d52895bc44f9fc35b068cfce47133 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sat, 25 Jul 2015 17:14:23 +0200
Subject: _MASSIVE_ pep8 revamp

Thank you so much PyCharm
---
 libmat/hachoir_editor/typed_field.py | 47 ++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 16 deletions(-)

(limited to 'libmat/hachoir_editor')

diff --git a/libmat/hachoir_editor/typed_field.py b/libmat/hachoir_editor/typed_field.py
index 0f0427b..606d39b 100644
--- a/libmat/hachoir_editor/typed_field.py
+++ b/libmat/hachoir_editor/typed_field.py
@@ -5,18 +5,21 @@ from hachoir_core.field import (
     isInteger, isString)
 from field import FakeField
 
+
 class EditableField(FakeField):
     """
     Pure virtual class used to write editable field class.
     """
 
     _is_altered = False
+
     def __init__(self, parent, name, value=None):
         FakeField.__init__(self, parent, name)
         self._value = value
 
     def _isAltered(self):
         return self._is_altered
+
     is_altered = property(_isAltered)
 
     def hasValue(self):
@@ -24,8 +27,10 @@ class EditableField(FakeField):
 
     def _computeSize(self):
         raise NotImplementedError()
+
     def _getValue(self):
         return self._value
+
     def _setValue(self, value):
         self._value = value
 
@@ -34,9 +39,11 @@ class EditableField(FakeField):
             return self._getValue()
         else:
             return FakeField._getValue(self)
+
     def _propSetValue(self, value):
         self._setValue(value)
         self._is_altered = True
+
     value = property(_propGetValue, _propSetValue)
 
     def _getSize(self):
@@ -44,6 +51,7 @@ class EditableField(FakeField):
             return self._computeSize()
         else:
             return FakeField._getSize(self)
+
     size = property(_getSize)
 
     def _write(self, output):
@@ -55,6 +63,7 @@ class EditableField(FakeField):
         else:
             return FakeField.writeInto(self, output)
 
+
 class EditableFixedField(EditableField):
     """
     Editable field with fixed size.
@@ -69,8 +78,10 @@ class EditableFixedField(EditableField):
 
     def _getSize(self):
         return self._size
+
     size = property(_getSize)
 
+
 class EditableBits(EditableFixedField):
     def __init__(self, parent, name, *args):
         if args:
@@ -90,14 +101,15 @@ class EditableBits(EditableFixedField):
             self._is_altered = True
 
     def _setValue(self, value):
-        if not(0 <= value < (1 << self._size)):
+        if not (0 <= value < (1 << self._size)):
             raise ValueError("Invalid value, must be in range %s..%s"
-                % (0, (1 << self._size) - 1))
+                             % (0, (1 << self._size) - 1))
         self._value = value
 
     def _write(self, output):
         output.writeBits(self._size, self._value, self._parent.endian)
 
+
 class EditableBytes(EditableField):
     def _setValue(self, value):
         if not value: raise ValueError(
@@ -110,11 +122,12 @@ class EditableBytes(EditableField):
     def _write(self, output):
         output.writeBytes(self._value)
 
+
 class EditableString(EditableField):
     MAX_SIZE = {
-        "Pascal8": (1 << 8)-1,
-        "Pascal16": (1 << 16)-1,
-        "Pascal32": (1 << 32)-1,
+        "Pascal8": (1 << 8) - 1,
+        "Pascal16": (1 << 16) - 1,
+        "Pascal32": (1 << 32) - 1,
     }
 
     def __init__(self, parent, name, *args, **kw):
@@ -152,7 +165,7 @@ class EditableString(EditableField):
         self._value = value
 
     def _computeSize(self):
-        return (self._prefix_size + len(self._value) + len(self._suffix_str))*8
+        return (self._prefix_size + len(self._value) + len(self._suffix_str)) * 8
 
     def _write(self, output):
         if self._format in GenericString.SUFFIX_FORMAT:
@@ -166,6 +179,7 @@ class EditableString(EditableField):
             output.writeInteger(len(self._value), False, size, self._parent.endian)
             output.writeBytes(self._value)
 
+
 class EditableCharacter(EditableFixedField):
     def __init__(self, parent, name, *args):
         if args:
@@ -190,16 +204,17 @@ class EditableCharacter(EditableFixedField):
     def _write(self, output):
         output.writeBytes(self._value)
 
+
 class EditableInteger(EditableFixedField):
     VALID_VALUE_SIGNED = {
-        8: (-(1 << 8), (1 << 8)-1),
-        16: (-(1 << 15), (1 << 15)-1),
-        32: (-(1 << 31), (1 << 31)-1),
+        8: (-(1 << 8), (1 << 8) - 1),
+        16: (-(1 << 15), (1 << 15) - 1),
+        32: (-(1 << 31), (1 << 31) - 1),
     }
     VALID_VALUE_UNSIGNED = {
-        8: (0, (1 << 8)-1),
-        16: (0, (1 << 16)-1),
-        32: (0, (1 << 32)-1)
+        8: (0, (1 << 8) - 1),
+        16: (0, (1 << 16) - 1),
+        32: (0, (1 << 32) - 1)
     }
 
     def __init__(self, parent, name, *args):
@@ -227,14 +242,15 @@ class EditableInteger(EditableFixedField):
         else:
             valid = self.VALID_VALUE_UNSIGNED
         minval, maxval = valid[self._size]
-        if not(minval <= value <= maxval):
+        if not (minval <= value <= maxval):
             raise ValueError("Invalid value, must be in range %s..%s"
-                % (minval, maxval))
+                             % (minval, maxval))
         self._value = value
 
     def _write(self, output):
         output.writeInteger(
-            self.value, self._signed, self._size//8, self._parent.endian)
+            self.value, self._signed, self._size // 8, self._parent.endian)
+
 
 def createEditableField(fieldset, field):
     if isInteger(field):
@@ -250,4 +266,3 @@ def createEditableField(fieldset, field):
     else:
         cls = FakeField
     return cls(fieldset, field.name)
-
-- 
cgit v1.3