similarity index 100%

rename from HACKING.markdown

rename to HACKING.md

similarity index 100%

rename from README.markdown

rename to README.md

@@ -33,9 +33,9 @@ class MyDotWindow(xdot.DotWindow):

     def on_url_clicked(self, widget, url, event):

         dialog = Gtk.MessageDialog(

-                parent = self, 

-                buttons = Gtk.ButtonsType.OK,

-                message_format="%s clicked" % url)

+            parent=self,

+            buttons=Gtk.ButtonsType.OK,

+            message_format="%s clicked" % url)

         dialog.connect('response', lambda dialog, response: dialog.destroy())

         dialog.run()

         return True

@@ -26,7 +26,6 @@ gi.require_version('Gtk', '3.0')

 from gi.repository import Gtk

 from gi.repository import Gdk

-from gi.repository import GdkPixbuf

 from xdot import DotWidget, DotWindow

@@ -68,7 +68,7 @@ Shortcuts:

     width = height = 512

     if options.geometry:

         try:

-            width,height = (int(i) for i in options.geometry.split('x'))

+            width, height = (int(i) for i in options.geometry.split('x'))

         except ValueError:

             parser.error('invalid window geometry')

@@ -44,7 +44,9 @@ class ParseError(Exception):

         self.col = col

     def __str__(self):

-        return ':'.join([str(part) for part in (self.filename, self.line, self.col, self.msg) if part != None])

+        return ':'.join([str(part) for part in

+                         (self.filename, self.line, self.col, self.msg)

+                         if part is not None])

 class Lexer:

@@ -55,7 +57,7 @@ class Lexer:

     newline_re = re.compile(br'\r\n?|\n')

-    def __init__(self, buf = None, pos = 0, filename = None, fp = None):

+    def __init__(self, buf=None, pos=0, filename=None, fp=None):

         if fp is not None:

             try:

                 fileno = fp.fileno()

@@ -69,7 +71,7 @@ class Lexer:

                 # map the whole file into memory

                 if length:

                     # length must not be zero

-                    buf = mmap.mmap(fileno, length, access = mmap.ACCESS_READ)

+                    buf = mmap.mmap(fileno, length, access=mmap.ACCESS_READ)

                     pos = os.lseek(fileno, 0, 1)

                 else:

                     buf = b''

@@ -108,7 +110,7 @@ class Lexer:

                 raise ParseError(msg, self.filename, line, col)

             else:

                 break

-        return Token(type = type, text = text, line = line, col = col)

+        return Token(type=type, text=text, line=line, col=col)

     def consume(self, text):

         # update line number

@@ -124,7 +126,7 @@ class Lexer:

             if tabpos == -1:

                 break

             self.col += tabpos - pos

-            self.col = ((self.col - 1)//self.tabsize + 1)*self.tabsize + 1

+            self.col = ((self.col - 1) // self.tabsize + 1) * self.tabsize + 1

             pos = tabpos + 1

         self.col += len(text) - pos

@@ -68,19 +68,19 @@ class Parser:

     def match(self, type):

         if self.lookahead.type != type:

             raise ParseError(

-                msg = 'unexpected token %r' % self.lookahead.text,

-                filename = self.lexer.filename,

-                line = self.lookahead.line,

-                col = self.lookahead.col)

+                msg='unexpected token {}'.format(self.lookahead.text),

+                filename=self.lexer.filename,

+                line=self.lookahead.line,

+                col=self.lookahead.col)

     def skip(self, type):

         while self.lookahead.type != type:

             if self.lookahead.type == EOF:

                 raise ParseError(

-                   msg = 'unexpected end of file',

-                   filename = self.lexer.filename,

-                   line = self.lookahead.line,

-                   col = self.lookahead.col)

+                    msg='unexpected end of file',

+                    filename=self.lexer.filename,

+                    line=self.lookahead.line,

+                    col=self.lookahead.col)

             self.consume()

     def consume(self):

@@ -115,7 +115,7 @@ class XDotAttrParser:

         return res

     def skip_space(self):

-        while self.pos < len(self.buf) and self.buf[self.pos : self.pos + 1].isspace():

+        while self.pos < len(self.buf) and self.buf[self.pos:self.pos+1].isspace():

             self.pos += 1

     def read_int(self):

@@ -439,7 +439,8 @@ class DotParser(Parser):

         else:

             port = None

             compass_pt = None

-        # XXX: we don't really care about port and compass point values when parsing xdot

+            # XXX: we don't really care about port and compass point

+            # values when parsing xdot

         return node_id

     def parse_id(self):

@@ -463,7 +464,7 @@ class XDotParser(DotParser):

     XDOTVERSION = '1.7'

     def __init__(self, xdotcode):

-        lexer = DotLexer(buf = xdotcode)

+        lexer = DotLexer(buf=xdotcode)

         DotParser.__init__(self, lexer)

         self.nodes = []

@@ -483,7 +484,8 @@ class XDotParser(DotParser):

                 pass

             else:

                 if float(xdotversion) > float(self.XDOTVERSION):

-                    sys.stderr.write('warning: xdot version %s, but supported is %s\n' % (xdotversion, self.XDOTVERSION))

+                    sys.stderr.write('warning: xdot version %s, but supported is %s\n' %

+                                     (xdotversion, self.XDOTVERSION))

             # Parse bounding box

             try:

@@ -500,7 +502,7 @@ class XDotParser(DotParser):

                 self.yscale = -1.0

                 # FIXME: scale from points to pixels

-                self.width  = max(xmax - xmin, 1)

+                self.width = max(xmax - xmin, 1)

                 self.height = max(ymax - ymin, 1)

                 self.top_graph = False

@@ -54,10 +54,11 @@ class Scanner:

         flags = re.DOTALL

         if self.ignorecase:

             flags |= re.IGNORECASE

-        self.tokens_re = re.compile(

-            b'|'.join([b'(' + regexp + b')' for type, regexp, test_lit in self.tokens]),

-             flags

-        )

+            self.tokens_re = re.compile(

+                b'|'.join([b'(' + regexp + b')'

+                           for type, regexp, test_lit in self.tokens]),

+                flags

+            )

     def next(self, buf, pos):

         if pos >= len(buf):

@@ -71,7 +72,7 @@ class Scanner:

                 type = self.literals.get(text, type)

             return type, text, pos

         else:

-            c = buf[pos : pos + 1]

+            c = buf[pos:pos+1]

             return self.symbols.get(c, None), c, pos + 1

@@ -81,11 +82,11 @@ class DotScanner(Scanner):

     tokens = [

         # whitespace and comments

         (SKIP,

-            br'[ \t\f\r\n\v]+|'

-            br'//[^\r\n]*|'

-            br'/\*.*?\*/|'

-            br'#[^\r\n]*',

-        False),

+         br'[ \t\f\r\n\v]+|'

+         br'//[^\r\n]*|'

+         br'/\*.*?\*/|'

+         br'#[^\r\n]*',

+         False),

         # Alphanumeric IDs

         (ID, br'[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*', True),

@@ -25,7 +25,7 @@ from gi.repository import GLib

 class Animation(object):

-    step = 0.03 # seconds

+    step = 0.03  # seconds

     def __init__(self, dot_widget):

         self.dot_widget = dot_widget

@@ -45,7 +45,7 @@ class Animation(object):

             if not self.tick():

                 self.stop()

                 return False

-        except e:

+        except AttributeError as e:

             self.stop()

             raise e

         return True

@@ -92,8 +92,8 @@ class MoveToAnimation(LinearAnimation):

     def animate(self, t):

         sx, sy = self.source_x, self.source_y

         tx, ty = self.target_x, self.target_y

-        self.dot_widget.x = tx * t + sx * (1-t)

-        self.dot_widget.y = ty * t + sy * (1-t)

+        self.dot_widget.x = tx * t + sx * (1 - t)

+        self.dot_widget.y = ty * t + sy * (1 - t)

         self.dot_widget.queue_draw()

@@ -118,6 +118,6 @@ class ZoomToAnimation(MoveToAnimation):

     def animate(self, t):

         a, b, c = self.source_zoom, self.extra_zoom, self.target_zoom

-        self.dot_widget.zoom_ratio = c*t + b*t*(1-t) + a*(1-t)

+        self.dot_widget.zoom_ratio = c*t + b*t*(1 - t) + a*(1 - t)

         self.dot_widget.zoom_to_fit_on_resize = False

         MoveToAnimation.animate(self, t)

@@ -83,7 +83,8 @@ class TextShape(Shape):

                 # 'TypeError: font_options must be a cairo.FontOptions or None'

                 pass

             except KeyError:

-                # cairo.FontOptions is not registered as a foreign struct in older PyGObject versions.

+                # cairo.FontOptions is not registered as a foreign

+                # struct in older PyGObject versions.

                 # https://git.gnome.org/browse/pygobject/commit/?id=b21f66d2a399b8c9a36a1758107b7bdff0ec8eaa

                 pass

@@ -121,7 +122,7 @@ class TextShape(Shape):

         else:

             PangoCairo.update_layout(cr, layout)

-        descent = 2 # XXX get descender from font metrics

+        descent = 2  # XXX get descender from font metrics

         width, height = layout.get_size()

         width = float(width)/Pango.SCALE

@@ -132,7 +133,7 @@ class TextShape(Shape):

         # scale it so that the text fits inside its box

         if width > self.w:

             f = self.w / width

-            width = self.w # equivalent to width *= f

+            width = self.w  # equivalent to width *= f

             height *= f

             descent *= f

         else:

@@ -157,7 +158,7 @@ class TextShape(Shape):

         PangoCairo.show_layout(cr, layout)

         cr.restore()

-        if 0: # DEBUG

+        if 0:  # DEBUG

             # show where dot thinks the text should appear

             cr.set_source_rgba(1, 0, 0, .9)

             if self.j == self.LEFT:

@@ -21,6 +21,7 @@ SUBSCRIPT = 16

 STRIKE_THROUGH = 32

 OVERLINE = 64

+

 class Pen:

     """Store pen attributes."""

@@ -47,10 +47,10 @@ from .elements import Graph

 class DotWidget(Gtk.DrawingArea):

     """GTK widget that draws dot graphs."""

-    #TODO GTK3: Second argument has to be of type Gdk.EventButton instead of object.

+    # TODO GTK3: Second argument has to be of type Gdk.EventButton instead of object.

     __gsignals__ = {

-        'clicked' : (GObject.SIGNAL_RUN_LAST, None, (str, object)),

-        'error' : (GObject.SIGNAL_RUN_LAST, None, (str,))

+        'clicked': (GObject.SIGNAL_RUN_LAST, None, (str, object)),

+        'error': (GObject.SIGNAL_RUN_LAST, None, (str,))

     }

     filter = 'dot'

@@ -64,7 +64,8 @@ class DotWidget(Gtk.DrawingArea):

         self.set_can_focus(True)

         self.connect("draw", self.on_draw)

-        self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK)

+        self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK |

+                        Gdk.EventMask.BUTTON_RELEASE_MASK)

         self.connect("button-press-event", self.on_area_button_press)

         self.connect("button-release-event", self.on_area_button_release)

         self.add_events(Gdk.EventMask.POINTER_MOTION_MASK |

@@ -317,10 +318,11 @@ class DotWidget(Gtk.DrawingArea):

         return False

     print_settings = None

+

     def on_print(self, action=None):

         print_op = Gtk.PrintOperation()

-        if self.print_settings != None:

+        if self.print_settings is not None:

             print_op.set_print_settings(self.print_settings)

         print_op.connect("begin_print", self.begin_print)

@@ -346,7 +348,7 @@ class DotWidget(Gtk.DrawingArea):

     def get_drag_action(self, event):

         state = event.state

-        if event.button in (1, 2): # left or middle button

+        if event.button in (1, 2):  # left or middle button

             modifiers = Gtk.accelerator_get_default_mod_mask()

             if state & modifiers == Gdk.ModifierType.CONTROL_MASK:

                 return ZoomAction

@@ -376,8 +378,8 @@ class DotWidget(Gtk.DrawingArea):

         # for gtk's clicked event instead?

         deltax = self.pressx - event.x

         deltay = self.pressy - event.y

-        return (time.time() < self.presstime + click_timeout

-                and math.hypot(deltax, deltay) < click_fuzz)

+        return (time.time() < self.presstime + click_timeout and

+                math.hypot(deltax, deltay) < click_fuzz)

     def on_click(self, element, event):

         """Override this method in subclass to process

@@ -513,7 +515,8 @@ class DotWindow(Gtk.Window):

         actiongroup.add_actions((

             ('Open', Gtk.STOCK_OPEN, None, None, None, self.on_open),

             ('Reload', Gtk.STOCK_REFRESH, None, None, None, self.on_reload),

-            ('Print', Gtk.STOCK_PRINT, None, None, "Prints the currently visible part of the graph", self.dotwidget.on_print),

+            ('Print', Gtk.STOCK_PRINT, None, None,

+             "Prints the currently visible part of the graph", self.dotwidget.on_print),

             ('ZoomIn', Gtk.STOCK_ZOOM_IN, None, None, None, self.dotwidget.on_zoom_in),

             ('ZoomOut', Gtk.STOCK_ZOOM_OUT, None, None, None, self.dotwidget.on_zoom_out),

             ('ZoomFit', Gtk.STOCK_ZOOM_FIT, None, None, None, self.dotwidget.on_zoom_fit),

@@ -521,7 +524,7 @@ class DotWindow(Gtk.Window):

         ))

         find_action = FindMenuToolAction("Find", None,

-                                          "Find a node by name", None)

+                                         "Find a node by name", None)

         actiongroup.add_action(find_action)

         # Add the actiongroup to the uimanager

@@ -547,8 +550,8 @@ class DotWindow(Gtk.Window):

         find_toolitem.add(self.textentry)

         self.textentry.set_activates_default(True)

-        self.textentry.connect ("activate", self.textentry_activate, self.textentry);

-        self.textentry.connect ("changed", self.textentry_changed, self.textentry);

+        self.textentry.connect("activate", self.textentry_activate, self.textentry);

+        self.textentry.connect("changed", self.textentry_changed, self.textentry);

         self.show_all()

@@ -576,7 +579,7 @@ class DotWindow(Gtk.Window):

         dot_widget = self.dotwidget

         if not entry_text:

             dot_widget.set_highlight(None, search=True)

-            return;

+            return

         found_items = self.find_text(entry_text)

         dot_widget.set_highlight(found_items, search=True)