Removed DOS line ends and other minor changes

Author: nmariz

lib/mysqlx/crud.py

@@ -21,9 +21,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-from .statement import (FindStatement, AddStatement, RemoveStatement, ModifyStatement,
-                        SelectStatement, InsertStatement, DeleteStatement, UpdateStatement,
-                        CreateCollectionIndexStatement, DropCollectionIndexStatement)
+from .statement import (FindStatement, AddStatement, RemoveStatement,
+                        ModifyStatement, SelectStatement, InsertStatement,
+                        DeleteStatement, UpdateStatement,
+                        CreateCollectionIndexStatement,
+                        DropCollectionIndexStatement)
 
 
 _COUNT_TABLES_QUERY = ("SELECT COUNT(*) FROM information_schema.tables "
@@ -259,7 +261,7 @@ def remove(self, condition=None):
             mysqlx.RemoveStatement: RemoveStatement object.
         """
         rs = RemoveStatement(self)
-        if not condition == None:
+        if condition:
             rs.where(condition)
         return rs
 

lib/mysqlx/dbdoc.py

@@ -1,57 +1,57 @@
-# MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-
-# MySQL Connector/Python is licensed under the terms of the GPLv2
-# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
-# MySQL Connectors. There are special exceptions to the terms and
-# conditions of the GPLv2 as it is applied to this software, see the
-# FOSS License Exception
-# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-import json
-import uuid
-
-class DbDoc(object):
-    """Represents a generic document in JSON format.
-
-    Args:
-        value (object): The value can be a JSON string or a dict.
-
-    Raises:
-        Exception: If ``value`` type is not a basestring or dict.
-    """
-    def __init__(self, value):
-        # TODO: handle exceptions.  What happens if it doesn't load properly
-        if isinstance(value, dict):
-            self.__dict__ = value
-        elif isinstance(value, basestring):
-            self.__dict__ = json.loads(value)
-        else:
-            raise Exception("Unable to handle type: ".format(type(value)))
-
-    def __getitem__(self, index):
-        return self.__dict__[index]
-
-    def keys(self):
-        return self.__dict__.keys()
-
-    def ensure_id(self):
-        if "_id" not in self.__dict__:
-            self.__dict__["_id"] = str(uuid.uuid4())
-
-    def __str__(self):
-        return json.dumps(self.__dict__)
-        #return str(self.__dict__)
+# MySQL Connector/Python - MySQL driver written in Python.
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+
+# MySQL Connector/Python is licensed under the terms of the GPLv2
+# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
+# MySQL Connectors. There are special exceptions to the terms and
+# conditions of the GPLv2 as it is applied to this software, see the
+# FOSS License Exception
+# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+import json
+import uuid
+
+
+class DbDoc(object):
+    """Represents a generic document in JSON format.
+
+    Args:
+        value (object): The value can be a JSON string or a dict.
+
+    Raises:
+        Exception: If ``value`` type is not a basestring or dict.
+    """
+    def __init__(self, value):
+        # TODO: Handle exceptions. What happens if it doesn't load properly?
+        if isinstance(value, dict):
+            self.__dict__ = value
+        elif isinstance(value, basestring):
+            self.__dict__ = json.loads(value)
+        else:
+            raise Exception("Unable to handle type: ".format(type(value)))
+
+    def __getitem__(self, index):
+        return self.__dict__[index]
+
+    def keys(self):
+        return self.__dict__.keys()
+
+    def ensure_id(self):
+        if "_id" not in self.__dict__:
+            self.__dict__["_id"] = str(uuid.uuid4())
+
+    def __str__(self):
+        return json.dumps(self.__dict__)