resolve merge issues

jasonLaster · jasonLaster · commit 1e3f9f2f8211 · 2012-07-19T16:47:08.000-04:00
diff --git a/.hgignore b/.hgignore
@@ -3,5 +3,7 @@ bpython.egg-info/*
 .pyc
 tags
 _trial_temp
+.mo
+build/*
 env
 .DS_Store
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -47,8 +47,19 @@
 
 from bpython import importcompletion, inspection
 from bpython.formatter import Parenthesis
+from bpython.translations import _
 from bpython.autocomplete import Autocomplete
 
+# Needed for special handling of __abstractmethods__
+# abc only exists since 2.6, so check both that it exists and that it's
+# the one we're expecting
+try:
+    import abc
+    abc.ABCMeta
+    has_abc = True
+except (ImportError, AttributeError):
+    has_abc = False
+
 py3 = sys.version_info[0] == 3
 
 
