Minor improvements

docs/binlogstream.rst

@@ -1,6 +1,6 @@
-###################
+##################
 BinLogStreamReader
-###################
+##################
 
 
 .. automodule:: pymysqlreplication.binlogstream

docs/events.rst

@@ -1,6 +1,6 @@
-###################
+######
 Events
-###################
+######
 
 .. automodule:: pymysqlreplication.event
     :members:

docs/index.rst

@@ -19,7 +19,7 @@ Contents:
     licence
 
 Contributing
-==============
+============
 You can report issues and contribute to the project on:
 https://github.com/noplay/python-mysql-replication
 

docs/support.rst

@@ -1,6 +1,6 @@
-########
+#######
 Support
-########
+#######
 
 You can get support and discuss about new features on:
 https://groups.google.com/d/forum/python-mysql-replication

examples/logstash/mysql_to_logstash.py

@@ -8,7 +8,6 @@
 # python examples/logstash/mysql_to_logstash.py | java -jar logstash-1.1.13-flatjar.jar  agent -f examples/logstash/logstash-simple.conf
 
 import json
-import time
 import sys
 
 from pymysqlreplication import BinLogStreamReader
@@ -33,9 +32,7 @@ def main():
 
     for binlogevent in stream:
         for row in binlogevent.rows:
-            event = {}
-            event["schema"] = binlogevent.schema
-            event["table"] = binlogevent.table
+            event = {"schema": binlogevent.schema, "table": binlogevent.table}
 
             if isinstance(binlogevent, DeleteRowsEvent):
                 event["action"] = "delete"

pymysqlreplication/row_event.py

@@ -35,7 +35,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection):
         self.number_of_columns = self.packet.read_length_coded_binary()
         self.columns = self.table_map[self.table_id].columns
 
-        #Aditionnal informations
+        # Additional information
         self.schema = self.table_map[self.table_id].schema
         self.table = self.table_map[self.table_id].table
 
@@ -141,7 +141,7 @@ def _read_column_data(self, null_bitmap):
         return values
 
     def __add_fsp_to_time(self, time, column):
-        """Read and add the fractionnal part of time
+        """Read and add the fractional part of time
         For more details about new date format:
         http://dev.mysql.com/doc/internals/en/date-and-time-data-type-representation.html
         """
@@ -161,10 +161,10 @@ def __add_fsp_to_time(self, time, column):
         return time
 
     def __read_string(self, size, column):
-        str = self.packet.read_length_coded_pascal_string(size)
+        string = self.packet.read_length_coded_pascal_string(size)
         if column.character_set_name is not None:
-            str = str.decode(column.character_set_name)
-        return str
+            string = string.decode(column.character_set_name)
+        return string
 
     def __read_bit(self, column):
         """Read MySQL BIT type"""
@@ -503,7 +503,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection):
         self.table_obj = Table(self.column_schemas, self.table_id, self.schema,
                                self.table, self.columns)
 
-        # TODO: get this informations instead of trashing data
+        # TODO: get this information instead of trashing data
         # n              NULL-bitmask, length: (column-length * 8) / 7
 
     def get_table(self):

pymysqlreplication/tests/base.py

@@ -7,7 +7,7 @@
 
 
 class PyMySQLReplicationTestCase(unittest.TestCase):
-    """Test the module. Be carefull it will reset your MySQL server"""
+    """Test the module. Be careful it will reset your MySQL server"""
     database = {
         "host": "localhost",
         "user": "root",

pymysqlreplication/tests/test_data_type.py

@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
 
 import copy
-import datetime
 import platform
 import unittest
 
 from decimal import Decimal
 
 from pymysqlreplication.tests import base
-from pymysqlreplication.event import *
 from pymysqlreplication.constants.BINLOG import *
 from pymysqlreplication.row_event import *
 
@@ -405,26 +403,26 @@ def test_encoding_latin1(self):
         self.connect_conn_control(db)
 
         if platform.python_version_tuple()[0] == "2":
-            str = unichr(233)
+            string = unichr(233)
         else:
-            str = "\u00e9"
+            string = "\u00e9"
 
         create_query = "CREATE TABLE test (test CHAR(12)) CHARACTER SET latin1 COLLATE latin1_bin;"
-        insert_query = b"INSERT INTO test VALUES('" + str.encode('latin-1') + b"');"
+        insert_query = b"INSERT INTO test VALUES('" + string.encode('latin-1') + b"');"
         event = self.create_and_insert_value(create_query, insert_query)
-        self.assertEqual(event.rows[0]["values"]["test"], str)
+        self.assertEqual(event.rows[0]["values"]["test"], string)
 
     def test_encoding_utf8(self):
         if platform.python_version_tuple()[0] == "2":
-            str = unichr(0x20ac)
+            string = unichr(0x20ac)
         else:
-            str = "\u20ac"
+            string = "\u20ac"
 
         create_query = "CREATE TABLE test (test CHAR(12)) CHARACTER SET utf8 COLLATE utf8_bin;"
-        insert_query = b"INSERT INTO test VALUES('" + str.encode('utf-8') + b"')"
+        insert_query = b"INSERT INTO test VALUES('" + string.encode('utf-8') + b"')"
 
         event = self.create_and_insert_value(create_query, insert_query)
-        self.assertMultiLineEqual(event.rows[0]["values"]["test"], str)
+        self.assertMultiLineEqual(event.rows[0]["values"]["test"], string)
 
 
 if __name__ == "__main__":