Merge pull request julien-duponchelle#11 from bjoernhaeuser/master

Minor adjustments

Author: julien-duponchelle

pymysqlreplication/binlogstream.py

@@ -11,7 +11,7 @@
 class BinLogStreamReader(object):
     '''Connect to replication stream and read event'''
 
-    def __init__(self, connection_settings = {}, resume_stream = False, blocking = False, only_events = None, server_id = 255):
+    def __init__(self, connection_settings={}, resume_stream=False, blocking=False, only_events=None, server_id=255):
         '''
         resume_stream: Start for latest event of binlog or from older available event
         blocking: Read on stream is blocking
@@ -45,6 +45,7 @@ def __connect_to_ctl(self):
         self._ctl_connection_settings['db'] = 'information_schema'
         self._ctl_connection_settings['cursorclass'] = pymysql.cursors.DictCursor
         self._ctl_connection = pymysql.connect(**self._ctl_connection_settings)
+        self.__connected_ctl = True
 
     def __connect_to_stream(self):
         self._stream_connection = pymysql.connect(**self.__connection_settings)
@@ -61,7 +62,7 @@ def __connect_to_stream(self):
         # binlog-filename (string.EOF) -- filename of the binlog on the master
         command = COM_BINLOG_DUMP
         prelude = struct.pack('<i', len(self.__log_file) + 11) \
-                + int2byte(command)
+                  + int2byte(command)
         if self.__log_pos is None:
             if self.__resume_stream:
                 prelude += struct.pack('<I', log_pos)
@@ -80,9 +81,9 @@ def __connect_to_stream(self):
 
     def fetchone(self):
         while True:
-            if self.__connected_stream == False:
+            if not self.__connected_stream:
                 self.__connect_to_stream()
-            if self.__connected_ctl == False:
+            if not self.__connected_ctl:
                 self.__connect_to_ctl()
             pkt = None
             try:

pymysqlreplication/event.py

@@ -47,7 +47,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection):
     def dump(self):
         print("=== %s ===" % (self.__class__.__name__))
         print("Position: %d" % self.position)
-        print("Next binlog file: %d" % self.next_binlog)
+        print("Next binlog file: %s" % self.next_binlog)
         print()