nltk 3.2.1__zip → 3.3__zip

{nltk-3.2.1 → nltk-3.3}/nltk/app/concordance_app.py

@@ -1,6 +1,6 @@
 # Natural Language Toolkit: Concordance Application
 #
-# Copyright (C) 2001-2016 NLTK Project
+# Copyright (C) 2001-2018 NLTK Project
 # Author: Sumukh Ghodke <sghodke@csse.unimelb.edu.au>
 # URL: <http://nltk.org/>
 # For license information, see LICENSE.TXT
@@ -9,14 +9,12 @@
 import nltk.compat
 import re
 import threading
-if nltk.compat.PY3:
-    import queue as q
-else:
-    import Queue as q
-import tkinter.font
-from tkinter import (Tk, Button, END, Entry, Frame, IntVar, LEFT,
-                     Label, Menu, OptionMenu, SUNKEN, Scrollbar,
-                     StringVar, Text)
+
+from six.moves import queue as q
+from six.moves.tkinter_font import Font
+from six.moves.tkinter import (Tk, Button, END, Entry, Frame, IntVar, LEFT,
+                               Label, Menu, OptionMenu, SUNKEN, Scrollbar,
+                               StringVar, Text)
 
 from nltk.corpus import (cess_cat, brown, nps_chat, treebank, sinica_treebank,
                          alpino, indian, floresta, mac_morpho, cess_esp)
@@ -240,7 +238,7 @@ class ConcordanceSearchView(object):
         vscrollbar = Scrollbar(i1, borderwidth=1)
         hscrollbar = Scrollbar(i2, borderwidth=1, orient='horiz')
         self.results_box = Text(i1,
-                                font=tkinter.font.Font(family='courier', size='16'),
+                                font=Font(family='courier', size='16'),
                                 state='disabled', borderwidth=1,
                                                             yscrollcommand=vscrollbar.set,
                                 xscrollcommand=hscrollbar.set, wrap='none', width='40', height = '20', exportselection=1)
@@ -280,7 +278,7 @@ class ConcordanceSearchView(object):
         ABOUT = ("NLTK Concordance Search Demo\n")
         TITLE = 'About: NLTK Concordance Search Demo'
         try:
-            from tkinter.messagebox import Message
+            from six.moves.tkinter_messagebox import Message
             Message(message=ABOUT, title=TITLE, parent=self.main_frame).show()
         except:
             ShowText(self.top, TITLE, ABOUT)

{nltk-3.2.1 → nltk-3.3}/nltk/app/nemo_app.py

@@ -7,8 +7,9 @@ Finding (and Replacing) Nemo
 Instant Regular Expressions
 Created by Aristide Grange
 """
-import nltk.compat
-import tkinter as tk
+
+from six.moves.tkinter import (Frame, Label, PhotoImage, Scrollbar, Text, Tk,
+                               SEL_FIRST, SEL_LAST)
 import re
 import itertools
 
@@ -50,30 +51,30 @@ textParams = {
 
 class Zone:
     def __init__(self, image, initialField, initialText):
-        frm = tk.Frame(root)
+        frm = Frame(root)
         frm.config(background="white")
-        self.image = tk.PhotoImage(format='gif',data=images[image.upper()])
-        self.imageDimmed = tk.PhotoImage(format='gif',data=images[image])
-        self.img = tk.Label(frm)
+        self.image = PhotoImage(format='gif',data=images[image.upper()])
+        self.imageDimmed = PhotoImage(format='gif',data=images[image])
+        self.img = Label(frm)
         self.img.config(borderwidth=0)
         self.img.pack(side = "left")
-        self.fld = tk.Text(frm, **fieldParams)
+        self.fld = Text(frm, **fieldParams)
         self.initScrollText(frm,self.fld,initialField)
-        frm = tk.Frame(root)
-        self.txt = tk.Text(frm, **textParams)
+        frm = Frame(root)
+        self.txt = Text(frm, **textParams)
         self.initScrollText(frm,self.txt,initialText)
         for i in range(2):
             self.txt.tag_config(colors[i], background = colors[i])
             self.txt.tag_config("emph"+colors[i], foreground = emphColors[i])
     def initScrollText(self,frm,txt,contents):
-        scl = tk.Scrollbar(frm)
+        scl = Scrollbar(frm)
         scl.config(command = txt.yview)
         scl.pack(side="right",fill="y")
         txt.pack(side = "left", expand=True, fill="x")
         txt.config(yscrollcommand = scl.set)
         txt.insert("1.0",contents)
         frm.pack(fill = "x")
-        tk.Frame(height=2, bd=1, relief="ridge").pack(fill="x")
+        Frame(height=2, bd=1, relief="ridge").pack(fill="x")
     def refresh(self):
         self.colorCycle = itertools.cycle(colors)
         try:
@@ -99,12 +100,12 @@ class FindZone(Zone):
         self.rex = re.compile("") # default value in case of misformed regexp
         self.rex = re.compile(self.fld.get("1.0","end")[:-1],re.MULTILINE)
         try:
-            re.compile("(?P<emph>%s)" % self.fld.get(tk.SEL_FIRST,
-                                                      tk.SEL_LAST))
+            re.compile("(?P<emph>%s)" % self.fld.get(SEL_FIRST,
+                                                      SEL_LAST))
             self.rexSel = re.compile("%s(?P<emph>%s)%s" % (
-                self.fld.get("1.0",tk.SEL_FIRST),
-                self.fld.get(tk.SEL_FIRST,tk.SEL_LAST),
-                self.fld.get(tk.SEL_LAST,"end")[:-1],
+                self.fld.get("1.0",SEL_FIRST),
+                self.fld.get(SEL_FIRST,SEL_LAST),
+                self.fld.get(SEL_LAST,"end")[:-1],
             ),re.MULTILINE)
         except:
             self.rexSel = self.rex
@@ -134,7 +135,7 @@ def launchRefresh(_):
 
 def app():
     global root, sz, rz, rex0
-    root = tk.Tk()
+    root = Tk()
     root.resizable(height=False,width=True)
     root.title(windowTitle)
     root.minsize(width=250,height=0)

{nltk-3.2.1 → nltk-3.3}/nltk/app/rdparser_app.py

@@ -1,6 +1,6 @@
 # Natural Language Toolkit: Recursive Descent Parser Application
 #
-# Copyright (C) 2001-2016 NLTK Project
+# Copyright (C) 2001-2018 NLTK Project
 # Author: Edward Loper <edloper@gmail.com>
 # URL: <http://nltk.org/>
 # For license information, see LICENSE.TXT
@@ -64,10 +64,10 @@ Keyboard Shortcuts::
       [q]\t Quit
 """
 from __future__ import division
-import nltk.compat
-import tkinter.font
-from tkinter import (Listbox, IntVar, Button,
-                     Frame, Label, Menu, Scrollbar, Tk)
+
+from six.moves.tkinter_font import Font
+from six.moves.tkinter import (Listbox, IntVar, Button, Frame, Label, Menu,
+                               Scrollbar, Tk)
 
 from nltk.tree import Tree
 from nltk.util import in_idle
@@ -129,20 +129,20 @@ class RecursiveDescentApp(object):
 
     def _init_fonts(self, root):
         # See: <http://www.astro.washington.edu/owen/ROTKFolklore.html>
-        self._sysfont = tkinter.font.Font(font=Button()["font"])
+        self._sysfont = Font(font=Button()["font"])
         root.option_add("*Font", self._sysfont)
 
         # TWhat's our font size (default=same as sysfont)
         self._size = IntVar(root)
         self._size.set(self._sysfont.cget('size'))
 
-        self._boldfont = tkinter.font.Font(family='helvetica', weight='bold',
+        self._boldfont = Font(family='helvetica', weight='bold',
                                     size=self._size.get())
-        self._font = tkinter.font.Font(family='helvetica',
+        self._font = Font(family='helvetica',
                                     size=self._size.get())
         if self._size.get() < 0: big = self._size.get()-2
         else: big = self._size.get()+2
-        self._bigfont = tkinter.font.Font(family='helvetica', weight='bold',
+        self._bigfont = Font(family='helvetica', weight='bold',
                                     size=big)
 
     def _init_grammar(self, parent):
@@ -585,7 +585,7 @@ class RecursiveDescentApp(object):
                  "Written by Edward Loper")
         TITLE = 'About: Recursive Descent Parser Application'
         try:
-            from tkinter.messagebox import Message
+            from six.moves.tkinter_messagebox import Message
             Message(message=ABOUT, title=TITLE).show()
         except:
             ShowText(self._top, TITLE, ABOUT)
@@ -890,5 +890,3 @@ if __name__ == '__main__':
     app()
 
 __all__ = ['app']
-
-

{nltk-3.2.1 → nltk-3.3}/nltk/app/srparser_app.py

@@ -1,6 +1,6 @@
 # Natural Language Toolkit: Shift-Reduce Parser Application
 #
-# Copyright (C) 2001-2016 NLTK Project
+# Copyright (C) 2001-2018 NLTK Project
 # Author: Edward Loper <edloper@gmail.com>
 # URL: <http://nltk.org/>
 # For license information, see LICENSE.TXT
@@ -59,8 +59,19 @@ Keyboard Shortcuts::
       [h]\t Help
       [Ctrl-p]\t Print
       [q]\t Quit
+
 """
 
+from six.moves.tkinter_font import Font
+from six.moves.tkinter import (IntVar, Listbox, Button, Frame, Label, Menu,
+                               Scrollbar, Tk)
+
+from nltk.tree import Tree
+from nltk.parse import SteppingShiftReduceParser
+from nltk.util import in_idle
+from nltk.draw.util import CanvasFrame, EntryDialog, ShowText, TextWidget
+from nltk.draw import CFGEditor, TreeSegmentWidget, tree_to_treesegment
+
 """
 Possible future improvements:
   - button/window to change and/or select text.  Just pop up a window
@@ -73,17 +84,6 @@ Possible future improvements:
     responsible for that.
 """
 
-import nltk.compat
-import tkinter.font
-from tkinter import (IntVar, Listbox, Button, Frame, Label, Menu,
-                     Scrollbar, Tk)
-
-from nltk.tree import Tree
-from nltk.parse import SteppingShiftReduceParser
-from nltk.util import in_idle
-from nltk.draw.util import CanvasFrame, EntryDialog, ShowText, TextWidget
-from nltk.draw import CFGEditor, TreeSegmentWidget, tree_to_treesegment
-
 class ShiftReduceApp(object):
     """
     A graphical tool for exploring the shift-reduce parser.  The tool
@@ -138,16 +138,16 @@ class ShiftReduceApp(object):
 
     def _init_fonts(self, root):
         # See: <http://www.astro.washington.edu/owen/ROTKFolklore.html>
-        self._sysfont = tkinter.font.Font(font=Button()["font"])
+        self._sysfont = Font(font=Button()["font"])
         root.option_add("*Font", self._sysfont)
 
         # TWhat's our font size (default=same as sysfont)
         self._size = IntVar(root)
         self._size.set(self._sysfont.cget('size'))
 
-        self._boldfont = tkinter.font.Font(family='helvetica', weight='bold',
+        self._boldfont = Font(family='helvetica', weight='bold',
                                     size=self._size.get())
-        self._font = tkinter.font.Font(family='helvetica',
+        self._font = Font(family='helvetica',
                                     size=self._size.get())
 
     def _init_grammar(self, parent):
@@ -552,7 +552,7 @@ class ShiftReduceApp(object):
                  "Written by Edward Loper")
         TITLE = 'About: Shift-Reduce Parser Application'
         try:
-            from tkinter.messagebox import Message
+            from six.moves.tkinter_messagebox import Message
             Message(message=ABOUT, title=TITLE).show()
         except:
             ShowText(self._top, TITLE, ABOUT)

{nltk-3.2.1 → nltk-3.3}/nltk/app/wordfreq_app.py

@@ -1,6 +1,6 @@
 # Natural Language Toolkit: Wordfreq Application
 #
-# Copyright (C) 2001-2016 NLTK Project
+# Copyright (C) 2001-2018 NLTK Project
 # Author: Sumukh Ghodke <sghodke@csse.unimelb.edu.au>
 # URL: <http://nltk.org/>
 # For license information, see LICENSE.TXT

{nltk-3.2.1 → nltk-3.3}/nltk/app/wordnet_app.py

@@ -1,6 +1,6 @@
 # Natural Language Toolkit: WordNet Browser Application
 #
-# Copyright (C) 2001-2016 NLTK Project
+# Copyright (C) 2001-2018 NLTK Project
 # Author: Jussi Salmela <jtsalmela@users.sourceforge.net>
 #         Paul Bone <pbone@students.csse.unimelb.edu.au>
 # URL: <http://nltk.org/>
@@ -63,6 +63,8 @@ import base64
 import pickle
 import copy
 
+from six.moves.urllib.parse import unquote_plus
+
 from nltk import compat
 from nltk.corpus import wordnet as wn
 from nltk.corpus.reader.wordnet import Synset, Lemma
@@ -95,7 +97,7 @@ class MyServerHandler(BaseHTTPRequestHandler):
     def do_GET(self):
         global firstClient
         sp = self.path[1:]
-        if compat.unquote_plus(sp) == 'SHUTDOWN THE SERVER':
+        if unquote_plus(sp) == 'SHUTDOWN THE SERVER':
             if server_mode:
                 page = "Server must be killed with SIGTERM."
                 type = "text/plain"
@@ -114,7 +116,7 @@ class MyServerHandler(BaseHTTPRequestHandler):
 
         elif sp.endswith('.html'): # Trying to fetch a HTML file TODO:
             type = 'text/html'
-            usp = compat.unquote_plus(sp)
+            usp = unquote_plus(sp)
             if usp == 'NLTK Wordnet Browser Database Info.html':
                 word = '* Database Info *'
                 if os.path.isfile(usp):
@@ -279,7 +281,6 @@ WordNet Browser Utilities.
 This provides a backend to both wxbrowse and browserver.py.
 """
 
-
 ################################################################################
 #
 # Main logic for wordnet browser.
@@ -697,11 +698,11 @@ def page_from_word(word):
     """
     Return a HTML page for the given word.
 
-    :param word: The currently active word
     :type word: str
+    :param word: The currently active word
     :return: A tuple (page,word), where page is the new current HTML page
-             to be sent to the browser and
-             word is the new current word
+        to be sent to the browser and
+        word is the new current word
     :rtype: A tuple (str,str)
     """
     return page_from_reference(Reference(word))
@@ -763,7 +764,6 @@ def page_from_reference(href):
     return body, word
 
 
-
 #####################################################################
 # Static pages
 #####################################################################
@@ -799,7 +799,7 @@ def get_static_web_help_page():
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
      <!-- Natural Language Toolkit: Wordnet Interface: Graphical Wordnet Browser
-            Copyright (C) 2001-2016 NLTK Project
+            Copyright (C) 2001-2018 NLTK Project
             Author: Jussi Salmela <jtsalmela@users.sourceforge.net>
             URL: <http://nltk.org/>
             For license information, see LICENSE.TXT -->
@@ -870,7 +870,7 @@ def get_static_index_page(with_shutdown):
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"  "http://www.w3.org/TR/html4/frameset.dtd">
 <HTML>
      <!-- Natural Language Toolkit: Wordnet Interface: Graphical Wordnet Browser
-            Copyright (C) 2001-2016 NLTK Project
+            Copyright (C) 2001-2018 NLTK Project
             Author: Jussi Salmela <jtsalmela@users.sourceforge.net>
             URL: <http://nltk.org/>
             For license information, see LICENSE.TXT -->
@@ -904,7 +904,7 @@ def get_static_upper_page(with_shutdown):
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <!-- Natural Language Toolkit: Wordnet Interface: Graphical Wordnet Browser
-        Copyright (C) 2001-2016 NLTK Project
+        Copyright (C) 2001-2018 NLTK Project
         Author: Jussi Salmela <jtsalmela@users.sourceforge.net>
         URL: <http://nltk.org/>
         For license information, see LICENSE.TXT -->

{nltk-3.2.1 → nltk-3.3}/nltk/book.py

@@ -1,6 +1,6 @@
 # Natural Language Toolkit: Some texts for exploration in chapter 1 of the book
 #
-# Copyright (C) 2001-2016 NLTK Project
+# Copyright (C) 2001-2018 NLTK Project
 # Author: Steven Bird <stevenbird1@gmail.com>
 #
 # URL: <http://nltk.org/>
@@ -11,6 +11,7 @@ from nltk.corpus import (gutenberg, genesis, inaugural,
                          nps_chat, webtext, treebank, wordnet)
 from nltk.text import Text
 from nltk.probability import FreqDist
+from nltk.util import bigrams
 
 print("*** Introductory Examples for the NLTK Book ***")
 print("Loading text1, ..., text9 and sent1, ..., sent9")

{nltk-3.2.1 → nltk-3.3}/nltk/ccg/__init__.py

@@ -1,6 +1,6 @@
 # Natural Language Toolkit: Combinatory Categorial Grammar
 #
-# Copyright (C) 2001-2016 NLTK Project
+# Copyright (C) 2001-2018 NLTK Project
 # Author: Graeme Gange <ggange@csse.unimelb.edu.au>
 # URL: <http://nltk.org/>
 # For license information, see LICENSE.TXT

{nltk-3.2.1 → nltk-3.3}/nltk/ccg/api.py

@@ -1,47 +1,63 @@
 # Natural Language Toolkit: CCG Categories
 #
-# Copyright (C) 2001-2016 NLTK Project
+# Copyright (C) 2001-2018 NLTK Project
 # Author: Graeme Gange <ggange@csse.unimelb.edu.au>
 # URL: <http://nltk.org/>
 # For license information, see LICENSE.TXT
 from __future__ import unicode_literals
+from functools import total_ordering
+
+from abc import ABCMeta, abstractmethod
+from six import add_metaclass
+
 from nltk.internals import raise_unorderable_types
-from nltk.compat import (total_ordering, python_2_unicode_compatible,
-                         unicode_repr)
+from nltk.compat import (python_2_unicode_compatible, unicode_repr)
 
+
+@add_metaclass(ABCMeta)
 @total_ordering
 class AbstractCCGCategory(object):
     '''
     Interface for categories in combinatory grammars.
     '''
 
-    # Returns true if the category is primitive
+    @abstractmethod
     def is_primitive(self):
-        raise NotImplementedError()
+        """
+        Returns true if the category is primitive.
+        """
 
-    # Returns true if the category is a function application
+    @abstractmethod
     def is_function(self):
-        raise NotImplementedError()
+        """
+        Returns true if the category is a function application.
+        """
 
-    # Returns true if the category is a variable
+    @abstractmethod
     def is_var(self):
-        raise NotImplementedError()
+        """
+        Returns true if the category is a variable.
+        """
 
-    # Takes a set of (var, category) substitutions, and replaces every
-    # occurrence of the variable with the corresponding category
-    def substitute(self,substitutions):
-        raise NotImplementedError()
+    @abstractmethod
+    def substitute(self, substitutions):
+        """
+        Takes a set of (var, category) substitutions, and replaces every
+        occurrence of the variable with the corresponding category.
+        """
 
-    # Determines whether two categories can be unified.
-    #  - Returns None if they cannot be unified
-    #  - Returns a list of necessary substitutions if they can.'''
-    def can_unify(self,other):
-        raise NotImplementedError()
+    @abstractmethod
+    def can_unify(self, other):
+        """
+        Determines whether two categories can be unified.
+         - Returns None if they cannot be unified
+         - Returns a list of necessary substitutions if they can.
+        """
 
     # Utility functions: comparison, strings and hashing.
-
+    @abstractmethod
     def __str__(self):
-        raise NotImplementedError()
+        pass
 
     def __eq__(self, other):
         return (self.__class__ is other.__class__ and
@@ -78,7 +94,8 @@ class CCGVar(AbstractCCGCategory):
     def __init__(self, prim_only=False):
         """Initialize a variable (selects a new identifier)
 
-        :param prim_only: a boolean that determines whether the variable is restricted to primitives
+        :param prim_only: a boolean that determines whether the variable is
+                          restricted to primitives
         :type prim_only: bool
         """
         self._id = self.new_id()
@@ -87,7 +104,9 @@ class CCGVar(AbstractCCGCategory):
 
     @classmethod
     def new_id(cls):
-        """A class method allowing generation of unique variable identifiers."""
+        """
+        A class method allowing generation of unique variable identifiers.
+        """
         cls._maxID = cls._maxID + 1
         return cls._maxID - 1
 
@@ -108,9 +127,9 @@ class CCGVar(AbstractCCGCategory):
         """If there is a substitution corresponding to this variable,
         return the substituted category.
         """
-        for (var,cat) in substitutions:
+        for (var, cat) in substitutions:
             if var == self:
-                 return cat
+                return cat
         return self
 
     def can_unify(self, other):
@@ -118,7 +137,7 @@ class CCGVar(AbstractCCGCategory):
         a substitution is returned.
         """
         if other.is_primitive() or not self._prim_only:
-            return [(self,other)]
+            return [(self, other)]
         return None
 
     def id(self):
@@ -127,6 +146,7 @@ class CCGVar(AbstractCCGCategory):
     def __str__(self):
         return "_var" + str(self._id)
 
+
 @total_ordering
 @python_2_unicode_compatible
 class Direction(object):
@@ -135,7 +155,7 @@ class Direction(object):
     Also contains maintains information as to which combinators
     may be used with the category.
     '''
-    def __init__(self,dir,restrictions):
+    def __init__(self, dir, restrictions):
         self._dir = dir
         self._restrs = restrictions
         self._comparison_key = (dir, tuple(restrictions))
@@ -143,6 +163,7 @@ class Direction(object):
     # Testing the application direction
     def is_forward(self):
         return self._dir == '/'
+
     def is_backward(self):
         return self._dir == '\\'
 
@@ -164,31 +185,31 @@ class Direction(object):
     # Unification and substitution of variable directions.
     # Used only if type-raising is implemented as a unary rule, as it
     # must inherit restrictions from the argument category.
-    def can_unify(self,other):
+    def can_unify(self, other):
         if other.is_variable():
-            return [('_',self.restrs())]
+            return [('_', self.restrs())]
         elif self.is_variable():
-            return [('_',other.restrs())]
+            return [('_', other.restrs())]
         else:
             if self.restrs() == other.restrs():
                 return []
         return None
 
-    def substitute(self,subs):
+    def substitute(self, subs):
         if not self.is_variable():
             return self
 
         for (var, restrs) in subs:
             if var == '_':
-                return Direction(self._dir,restrs)
+                return Direction(self._dir, restrs)
         return self
 
     # Testing permitted combinators
     def can_compose(self):
-        return not ',' in self._restrs
+        return (',' not in self._restrs)
 
     def can_cross(self):
-        return not '.' in self._restrs
+        return ('.' not in self._restrs)
 
     def __eq__(self, other):
         return (self.__class__ is other.__class__ and
@@ -221,9 +242,9 @@ class Direction(object):
     # The negation operator reverses the direction of the application
     def __neg__(self):
         if self._dir == '/':
-            return Direction('\\',self._restrs)
+            return Direction('\\', self._restrs)
         else:
-            return Direction('/',self._restrs)
+            return Direction('/', self._restrs)
 
 
 @python_2_unicode_compatible
@@ -254,17 +275,17 @@ class PrimitiveCategory(AbstractCCGCategory):
         return self._categ
 
     # Substitution does nothing to a primitive category
-    def substitute(self,subs):
+    def substitute(self, subs):
         return self
 
     # A primitive can be unified with a class of the same
     # base category, given that the other category shares all
     # of its subclasses, or with a variable.
-    def can_unify(self,other):
+    def can_unify(self, other):
         if not other.is_primitive():
             return None
         if other.is_var():
-            return [(other,self)]
+            return [(other, self)]
         if other.categ() == self.categ():
             for restr in self._restrs:
                 if restr not in other.restrs():
@@ -303,24 +324,25 @@ class FunctionalCategory(AbstractCCGCategory):
 
     # Substitution returns the category consisting of the
     # substitution applied to each of its constituents.
-    def substitute(self,subs):
+    def substitute(self, subs):
         sub_res = self._res.substitute(subs)
         sub_dir = self._dir.substitute(subs)
         sub_arg = self._arg.substitute(subs)
-        return FunctionalCategory(sub_res,sub_arg,self._dir)
+        return FunctionalCategory(sub_res, sub_arg, self._dir)
 
     # A function can unify with another function, so long as its
     # constituents can unify, or with an unrestricted variable.
-    def can_unify(self,other):
+    def can_unify(self, other):
         if other.is_var():
-            return [(other,self)]
+            return [(other, self)]
         if other.is_function():
             sa = self._res.can_unify(other.res())
             sd = self._dir.can_unify(other.dir())
             if sa is not None and sd is not None:
-               sb = self._arg.substitute(sa).can_unify(other.arg().substitute(sa))
-               if sb is not None:
-                   return sa + sb
+                sb = self._arg.substitute(sa).can_unify(
+                    other.arg().substitute(sa))
+                if sb is not None:
+                    return sa + sb
         return None
 
     # Constituent accessors
@@ -335,5 +357,3 @@ class FunctionalCategory(AbstractCCGCategory):
 
     def __str__(self):
         return "(%s%s%s)" % (self._res, self._dir, self._arg)
-
-