Merge.

sebastinas · sebastinas · commit 02808712d0ee · 2012-09-29T23:55:04.000+02:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -22,7 +22,6 @@
 #
 
 import __builtin__
-import __main__
 import rlcompleter
 import re
 from bpython import inspection
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -1,6 +1,5 @@
 import os
 import unittest
-import sys
 from itertools import islice
 from mock import Mock
 from bpython import config, repl, cli, autocomplete

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`#`
`23`	`23`
`24`	`24`	`import __builtin__`
`25`		`-import __main__`
`26`	`25`	`import rlcompleter`
`27`	`26`	`import re`
`28`	`27`	`from bpython import inspection`