File "/usr/lib/python3/dist-packages/IPython/config/__init__.py", line 16, in <module> from .application import * File "/usr/lib/python3/dist-packages/IPython/config/application.py", line 31, in <module> from IPython.config.configurable import SingletonConfigurable File "/usr/lib/python3/dist-packages/IPython/config/configurable.py", line 33, in <module> from IPython.utils.text import indent, wrap_paragraphs File "/usr/lib/python3/dist-packages/IPython/utils/text.py", line 28, in <module> from IPython.external.path import path File "/usr/lib/python3/dist-packages/IPython/external/path/__init__.py", line 2, in <module> from path import * File "/home/jhammel/python/path.py", line 25 print root(path) ^

#!/usr/bin/env python

import optparse
import os
import sys

def main(args=sys.argv[1:]):

    usage = '%prog [options]'
    parser = optparse.OptionParser(usage=usage, description=__doc__)
    options, args = parser.parse_args(args)

    lines = sys.stdin.readlines()
    diff = {'+': set(),
            '-': set()}
    for line in lines:
        for key, value in diff.items():
            if line.startswith(key):
                value.add(line[1:].strip())

    added = diff['+'].difference(diff['-'])
    minus = diff['-'].difference(diff['+'])

    print '+++'
    for line in sorted(added):
        print line
    print '---'
    for line in sorted(minus):
        print line

if __name__ == '__main__':
    main()