clean up code in class WebFeatureService_2_0_0

owslib/feature/wfs200.py

@@ -46,19 +46,26 @@ class WebFeatureService_2_0_0(WebFeatureService_):
     Implements IWebFeatureService.
     """
 
-    def __new__(
+    def __getitem__(self, name):
+        """ check contents dictionary to allow dict like access to service layers"""
+        if name in list(self.__getattribute__("contents").keys()):
+            return self.__getattribute__("contents")[name]
+        else:
+            raise KeyError("No content named %s" % name)
+
+    def __init__(
         self,
         url,
         version,
-        xml,
+        xml=None,
         parse_remote_metadata=False,
         timeout=30,
         headers=None,
         username=None,
         password=None,
         auth=None,
     ):
-        """ overridden __new__ method
+        """Initialize.
 
         @type url: string
         @param url: url of WFS capabilities document
@@ -73,40 +80,6 @@ def __new__(
         @param auth: instance of owslib.util.Authentication
         @return: initialized WebFeatureService_2_0_0 object
         """
-        obj = object.__new__(self)
-        obj.__init__(
-            url,
-            version,
-            xml,
-            parse_remote_metadata,
-            timeout,
-            headers=headers,
-            username=username,
-            password=password,
-            auth=auth,
-        )
-        return obj
-
-    def __getitem__(self, name):
-        """ check contents dictionary to allow dict like access to service layers"""
-        if name in list(self.__getattribute__("contents").keys()):
-            return self.__getattribute__("contents")[name]
-        else:
-            raise KeyError("No content named %s" % name)
-
-    def __init__(
-        self,
-        url,
-        version,
-        xml=None,
-        parse_remote_metadata=False,
-        timeout=30,
-        headers=None,
-        username=None,
-        password=None,
-        auth=None,
-    ):
-        """Initialize."""
         if auth:
             if username:
                 auth.username = username