Fixes, 1.0.2

jTransliterate/__init__.py

@@ -2,7 +2,7 @@
 #!/usr/bin/python
 
 __author__ = "Ryan McGrath <ryan@venodesigns.net>"
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 """
     A class that allows for easy transliteration of [Hirag/Katak]ana
@@ -62,7 +62,7 @@ class JapaneseTransliterator(object):
                     the class instance.
         """
         text = self.transliterate_from_kana_to_hira(text)
-        return self.transliterate_from_hira_to_latn(text)
+        return self.transliterate_from_hira_to_latn(text.encode('utf-8'))
     
     @defaultToSelfText    
     def transliterate_from_hira_to_latn(self, text):
@@ -129,7 +129,7 @@ class JapaneseTransliterator(object):
                     the class instance.
         """
         # Duplicate the text...
-        romaji = text * 1
+        romaji = (text * 1).decode('utf-8')
         kana = ''
         
         romaji = re.sub('/m([BbPp])/', 'n\1', romaji)

jTransliterate/test.py

@@ -13,18 +13,18 @@ print b.transliterate_from_hira_to_latn()
 # Should print "kanazawa"
 
 # Transliterate from either Hiragana or Katakana to Latin/English
-print b.transliterate_from_hrkt_to_latn(text = 'カナザワ')
+print b.transliterate_from_hrkt_to_latn(text = u'(ストロベリー)')
 # Should print "kanazawa"
 
 # Transliterate from Katakan to Hiragana (You... probably never need to do this)
-print b.transliterate_from_kana_to_hira(text = 'キットカート')
+#print b.transliterate_from_kana_to_hira(text = 'キットカート')
 # Should print "きっとかーと"
 
 # Transliterate from Hiragana to Katakana
-print b.transliterate_from_hira_to_kana(text = 'かなざわ')
+#print b.transliterate_from_hira_to_kana(text = 'かなざわ')
 # Should print "カナザワ" 
 
 # If you want to convert between half/full width kana, you can use the following
 # functions. I didn't care enough to do demos here. ;|
-b.transliterate_from_halfwidth_to_fullwidth()
-b.transliterate_from_fullwidth_to_halfwidth()
+#b.transliterate_from_halfwidth_to_fullwidth()
+#b.transliterate_from_fullwidth_to_halfwidth()

readme.md

@@ -22,25 +22,25 @@ Examples && Documentation
 from jTransliterate import JapaneseTransliterator
 
 # Transliterate from Latin/English to [Hirag/Katak]ana
-x = JapaneseTransliterator('kanazawa')
+x = JapaneseTransliterator(u'kanazawa')
 print x.transliterate_from_latn_to_hrkt()
 # Should print "かなざわ"
 
 # Transliterate from Hiragana to Latin/English
-b = JapaneseTransliterator('かなざわ')
+b = JapaneseTransliterator(u'かなざわ')
 print b.transliterate_from_hira_to_latn()
 # Should print "kanazawa"
 
 # Transliterate from either Hiragana or Katakana to Latin/English
-print b.transliterate_from_hrkt_to_latn(text = 'カナザワ')
+print b.transliterate_from_hrkt_to_latn(text = u'カナザワ')
 # Should print "kanazawa"
 
 # Transliterate from Katakan to Hiragana (You... probably never need to do this)
-print b.transliterate_from_kana_to_hira(text = 'キットカート')
+print b.transliterate_from_kana_to_hira(text = u'キットカート')
 # Should print "きっとかーと"
 
 # Transliterate from Hiragana to Katakana
-print b.transliterate_from_hira_to_kana(text = 'かなざわ')
+print b.transliterate_from_hira_to_kana(text = u'かなざわ')
 # Should print "カナザワ" 
 
 # If you want to convert between half/full width kana, you can use the following

setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 from setuptools import find_packages
 
 __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 setup(
     # Basic package information.