Python new syntax fixes

Author: rsb-23

.pylintrc

@@ -19,7 +19,6 @@ max-statements = 95
 disable=
 	I,
 	# W
-	broad-exception-caught,
 	deprecated-module,
 	fixme,
 	keyword-arg-before-vararg,
@@ -37,8 +36,5 @@ disable=
 	unidiomatic-typecheck,
 	# R
 	duplicate-code,
-	no-else-raise,
 	no-else-return,
-	super-with-arguments,
 	too-few-public-methods,
-	useless-object-inheritance,

tests/test_change_tz.py

@@ -5,9 +5,9 @@
 from vobject.change_tz import change_tz
 
 
-class StubCal(object):
-    class StubEvent(object):
-        class Node(object):
+class StubCal:
+    class StubEvent:
+        class Node:
             def __init__(self, value):
                 self.value = value
 

vobject/base.py

@@ -69,7 +69,7 @@ def to_basestring(s):
 # --------------------------------- Main classes -------------------------------
 
 
-class VBase(object):
+class VBase:
     """
     Base class for ContentLine and Component.
 
@@ -88,7 +88,7 @@ class VBase(object):
     """
 
     def __init__(self, group=None, *args, **kwds):
-        super(VBase, self).__init__(*args, **kwds)
+        super().__init__(*args, **kwds)
         self.name = None
         self.group = group
         self.behavior = None
@@ -176,11 +176,11 @@ def transformToNative(self):
                     if lineNumber is not None:
                         e.lineNumber = lineNumber
                     raise
-                else:
-                    msg = "In transformToNative, unhandled exception on line {0}: {1}: {2}"
-                    msg = msg.format(lineNumber, sys.exc_info()[0], sys.exc_info()[1])
-                    msg = msg + " (" + str(self_orig) + ")"
-                    raise ParseError(msg, lineNumber)
+
+                msg = "In transformToNative, unhandled exception on line {0}: {1}: {2}"
+                msg = msg.format(lineNumber, sys.exc_info()[0], sys.exc_info()[1])
+                msg = msg + " (" + str(self_orig) + ")"
+                raise ParseError(msg, lineNumber)
 
     def transformFromNative(self):
         """
@@ -205,10 +205,10 @@ def transformFromNative(self):
                     if lineNumber is not None:
                         e.lineNumber = lineNumber
                     raise
-                else:
-                    msg = "In transformFromNative, unhandled exception on line {0} {1}: {2}"
-                    msg = msg.format(lineNumber, sys.exc_info()[0], sys.exc_info()[1])
-                    raise NativeError(msg, lineNumber)
+
+                msg = "In transformFromNative, unhandled exception on line {0} {1}: {2}"
+                msg = msg.format(lineNumber, sys.exc_info()[0], sys.exc_info()[1])
+                raise NativeError(msg, lineNumber)
         else:
             return self
 
@@ -282,7 +282,7 @@ def __init__(self, name, params, value, group=None, encoded=False, isNative=Fals
 
         Group is used as a positional argument to match parseLine's return
         """
-        super(ContentLine, self).__init__(group, *args, **kwds)
+        super().__init__(group, *args, **kwds)
 
         self.name = name.upper()
         self.encoded = encoded
@@ -330,7 +330,7 @@ def duplicate(cls, copyit):
         return newcopy
 
     def copy(self, copyit):
-        super(ContentLine, self).copy(copyit)
+        super().copy(copyit)
         self.name = copyit.name
         self.value = copy.copy(copyit.value)
         self.encoded = self.encoded
@@ -343,7 +343,7 @@ def copy(self, copyit):
     def __eq__(self, other):
         try:
             return (self.name == other.name) and (self.params == other.params) and (self.value == other.value)
-        except Exception:
+        except AttributeError:
             return False
 
     def __getattr__(self, name):
@@ -449,7 +449,7 @@ class Component(VBase):
     """
 
     def __init__(self, name=None, *args, **kwds):
-        super(Component, self).__init__(*args, **kwds)
+        super().__init__(*args, **kwds)
         self.contents = {}
         if name:
             self.name = name.upper()
@@ -467,7 +467,7 @@ def duplicate(cls, copyit):
         return newcopy
 
     def copy(self, copyit):
-        super(Component, self).copy(copyit)
+        super().copy(copyit)
 
         # deep copy of contents
         self.contents = {}
@@ -627,7 +627,7 @@ def lines(self):
     def sortChildKeys(self):
         try:
             first = [s for s in self.behavior.sortFirst if s in self.contents]
-        except Exception:
+        except AttributeError:
             first = []
         return first + sorted(k for k in self.contents if k not in first)
 
@@ -949,13 +949,18 @@ def foldOneLine(outbuf, input_, lineLength=75):
 
     TO-DO: This all seems odd. Is it still needed, especially in python3?
     """
-    if len(input_) < lineLength:
-        # Optimize for unfolded line case
+
+    def write_to_outbuf(text):
+        # TODO: remove py2
         try:
-            outbuf.write(bytes(input_, "UTF-8"))
-        except Exception:
+            outbuf.write(bytes(text, "UTF-8"))
+        except Exception:  # pylint: disable=broad-exception-caught
             # fall back on py2 syntax
-            outbuf.write(input_)
+            outbuf.write(text)
+
+    if len(input_) < lineLength:
+        # Optimize for unfolded line case
+        write_to_outbuf(text=input_)
 
     else:
         # Look for valid utf8 range and write that out
@@ -968,12 +973,7 @@ def foldOneLine(outbuf, input_, lineLength=75):
             s = decoded[start]  # take one char
             size = len(to_basestring(s))  # calculate it's size in bytes
             if counter + size > lineLength:
-                try:
-                    outbuf.write(bytes("\r\n ", "UTF-8"))
-                except Exception:
-                    # fall back on py2 syntax
-                    outbuf.write("\r\n ")
-
+                write_to_outbuf(text="\r\n ")
                 counter = 1  # one for space
 
             if str is unicode_type:
@@ -985,11 +985,7 @@ def foldOneLine(outbuf, input_, lineLength=75):
             written += size
             counter += size
             start += 1
-    try:
-        outbuf.write(bytes("\r\n", "UTF-8"))
-    except Exception:
-        # fall back on py2 syntax
-        outbuf.write("\r\n")
+    write_to_outbuf(text="\r\n")
 
 
 def defaultSerialize(obj, buf, lineLength):

vobject/behavior.py

@@ -2,7 +2,7 @@
 
 
 # ------------------------ Abstract class for behavior --------------------------
-class Behavior(object):
+class Behavior:
     """
     Behavior (validation, encoding, and transformations) for vobjects.
 

vobject/icalendar.py

@@ -119,7 +119,7 @@ def __init__(self, tzinfo=None, *args, **kwds):
         """
         Accept an existing Component or a tzinfo class.
         """
-        super(TimezoneComponent, self).__init__(*args, **kwds)
+        super().__init__(*args, **kwds)
         self.isNative = True
         # hack to make sure a behavior is assigned
         if self.behavior is None:
@@ -404,7 +404,7 @@ class RecurringComponent(Component):
     """
 
     def __init__(self, *args, **kwds):
-        super(RecurringComponent, self).__init__(*args, **kwds)
+        super().__init__(*args, **kwds)
 
         self.isNative = True
 
@@ -671,7 +671,7 @@ def __setattr__(self, name, value):
         if name == "rruleset":
             self.setrruleset(value)
         else:
-            super(RecurringComponent, self).__setattr__(name, value)
+            super().__setattr__(name, value)
 
 
 class TextBehavior(behavior.Behavior):
@@ -1052,7 +1052,7 @@ def serialize(cls, obj, buf, lineLength, validate=True, *args, **kwargs):
             first_components = [
                 s for s in cls.sortFirst if s in obj.contents and isinstance(obj.contents[s][0], Component)
             ]
-        except Exception:
+        except VObjectError:
             first_props = first_components = []
             # first_components = []
 
@@ -1849,8 +1849,7 @@ def escapableChar(c):
     def error(msg):
         if strict:
             raise ParseError(msg)
-        else:
-            logging.error(msg)
+        logging.error(msg)
 
     # vars which control state machine
     charIterator = enumerate(s)
@@ -1925,8 +1924,7 @@ def makeTimedelta(sign, week, day, hour, minute, sec):
     def error(msg):
         if strict:
             raise ParseError(msg)
-        else:
-            raise ParseError(msg)
+        raise ParseError(msg)
 
     # vars which control state machine
     charIterator = enumerate(s)

vobject/vcard.py

@@ -9,7 +9,7 @@
 # ------------------------ vCard structs ---------------------------------------
 
 
-class Name(object):
+class Name:
     def __init__(self, family="", given="", additional="", prefix="", suffix=""):
         """
         Each name attribute can be a string or a list of strings.
@@ -50,7 +50,7 @@ def __eq__(self, other):
             return False
 
 
-class Address(object):
+class Address:
     def __init__(self, street="", city="", region="", code="", country="", box="", extended=""):
         """
         Each name attribute can be a string or a list of strings.