Merge branch 'develop'

mozillazg · Aug 23, 2015 · 0b2447a · 0b2447a
2 parents 2d39361 + 0747098
commit 0b2447a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@ Changelog
 ---------
 
 
+0.8.5 (2015-08-23)
+++++++++++++++++++++
+
+* **bugfix** 修复 zh, ch, sh, z, c, s 顺序问题导致获取声母有误
+
+
 0.8.4 (2015-08-23)
 ++++++++++++++++++++
 

diff --git a/pypinyin/__init__.py b/pypinyin/__init__.py
@@ -14,7 +14,7 @@
 from . import phonetic_symbol, pinyin_dict
 
 __title__ = 'pypinyin'
-__version__ = '0.8.4'
+__version__ = '0.8.5'
 __author__ = 'mozillazg, 闲耘'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2014 mozillazg, 闲耘'
@@ -48,7 +48,7 @@
 # 单字拼音库
 PINYIN_DICT = pinyin_dict.pinyin_dict.copy()
 # 声母表
-_INITIALS = 'b,p,m,f,d,t,n,l,g,k,h,j,q,x,r,z,c,s,zh,ch,sh'.split(',')
+_INITIALS = 'b,p,m,f,d,t,n,l,g,k,h,j,q,x,r,zh,ch,sh,z,c,s,'.split(',')
 # 带声调字符与使用数字标识的字符的对应关系，类似： {u'ā': 'a1'}
 PHONETIC_SYMBOL = phonetic_symbol.phonetic_symbol.copy()
 # 所有的带声调字符