Keyword str and repr are now the same (#259)

Author: chrisrink10

src/basilisp/lang/keyword.py

@@ -25,11 +25,11 @@ def ns(self) -> Optional[str]:
 
     def __str__(self):
         if self._ns is not None:
-            return "{ns}/{name}".format(ns=self._ns, name=self._name)
-        return "{name}".format(name=self._name)
+            return ":{ns}/{name}".format(ns=self._ns, name=self._name)
+        return ":{name}".format(name=self._name)
 
     def __repr__(self):
-        return ":{me}".format(me=str(self))
+        return str(self)
 
     def __eq__(self, other):
         return self is other

tests/basilisp/compiler_test.py

@@ -470,8 +470,8 @@ def test_recur(ns: runtime.Namespace):
     lcompile(code)
 
     assert "a" == lcompile("(rev-str \"a\")")
-    assert "ba" == lcompile("(rev-str \"a\" :b)")
-    assert "3ba" == lcompile("(rev-str \"a\" :b 3)")
+    assert ":ba" == lcompile("(rev-str \"a\" :b)")
+    assert "3:ba" == lcompile("(rev-str \"a\" :b 3)")
 
 
 def test_recur_arity(ns: runtime.Namespace):

tests/basilisp/core_test.py

@@ -636,15 +636,15 @@ def test_prn_str():
 def test_print_str():
     assert '' == core.print_str()
     assert '' == core.print_str("")
-    assert 'kw' == core.print_str(kw.keyword('kw'))
-    assert 'hi there 3' == core.print_str(kw.keyword('hi'), "there", 3)
+    assert ':kw' == core.print_str(kw.keyword('kw'))
+    assert ':hi there 3' == core.print_str(kw.keyword('hi'), "there", 3)
 
 
 def test_println_str():
     assert '\n' == core.println_str()
     assert '\n' == core.println_str("")
-    assert 'kw\n' == core.println_str(kw.keyword('kw'))
-    assert 'hi there 3\n' == core.println_str(kw.keyword('hi'), "there", 3)
+    assert ':kw\n' == core.println_str(kw.keyword('kw'))
+    assert ':hi there 3\n' == core.println_str(kw.keyword('hi'), "there", 3)
 
 
 def test_re_find():

tests/basilisp/keyword_test.py

@@ -22,15 +22,15 @@ def test_keyword_name_and_ns():
 
 def test_keyword_str_and_repr():
     kw = keyword("kw", ns="ns")
-    assert str(kw) == "ns/kw"
+    assert str(kw) == ":ns/kw"
     assert repr(kw) == ":ns/kw"
 
     kw = keyword("kw", ns="some.ns")
-    assert str(kw) == "some.ns/kw"
+    assert str(kw) == ":some.ns/kw"
     assert repr(kw) == ":some.ns/kw"
 
     kw = keyword("kw")
-    assert str(kw) == "kw"
+    assert str(kw) == ":kw"
     assert repr(kw) == ":kw"