Merge branch 'develop'

Author: mozillazg

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - 3.4
+  - 3.5
 
 sudo: false
 
@@ -9,6 +9,7 @@ env:
   - TOX_ENV=py27
   - TOX_ENV=py33
   - TOX_ENV=py34
+  - TOX_ENV=py35
   - TOX_ENV=pypy
   - TOX_ENV=py2_snownlp
   - TOX_ENV=py2_jieba

CHANGELOG.rst

@@ -2,6 +2,14 @@ Changelog
 ---------
 
 
+0.9.0 (2015-09-20)
+++++++++++++++++++++
+
+* **不兼容** 将拼音词典库里的国际音标字母替换为 ASCII 字母. Thanks `@MingStar`_ :
+    * ``ɑ -> a``
+    * ``ɡ -> g``
+
+
 0.8.5 (2015-08-23)
 ++++++++++++++++++++
 

README.rst

@@ -170,9 +170,11 @@ Related Projects
 
 * `hotoo/pinyin`__: 汉语拼音转换工具 Node.js/JavaScript 版。
 * `mozillazg/go-pinyin`__: 汉语拼音转换工具 Go 版。
+* `mozillazg/rust-pinyin`__: 汉语拼音转换工具 Rust 版。
 
 __ https://github.com/hotoo/pinyin
 __ https://github.com/mozillazg/go-pinyin
+__ https://github.com/mozillazg/rust-pinyin
 
 
 .. |Build| image:: https://img.shields.io/travis/mozillazg/python-pinyin/master.svg

pypinyin/__init__.py

@@ -14,7 +14,7 @@
 from . import phonetic_symbol, pinyin_dict
 
 __title__ = 'pypinyin'
-__version__ = '0.8.5'
+__version__ = '0.9.0'
 __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,zh,ch,sh,z,c,s,'.split(',')
+_INITIALS = 'b,p,m,f,d,t,n,l,g,k,h,j,q,x,zh,ch,sh,r,z,c,s'.split(',')
 # 带声调字符与使用数字标识的字符的对应关系，类似： {u'ā': 'a1'}
 PHONETIC_SYMBOL = phonetic_symbol.phonetic_symbol.copy()
 # 所有的带声调字符

pypinyin/phrases_dict.py

@@ -4733,7 +4733,7 @@
     "干路": [["gàn"], ["lù"]],
     "干馏": [["gān"], ["liú"]],
     "干吗": [["gàn"], ["má"]],
-    "干嘛": [["gàn"], ["mɑ"]],
+    "干嘛": [["gàn"], ["ma"]],
     "干么": [["gàn"], ["mǒ"]],
     "干娘": [["gān"], ["niáng"]],
     "干呕": [["gān"], ["ǒu"]],
@@ -5266,7 +5266,7 @@
     "刮削": [["guā"], ["xiāo"]],
     "呱嗒": [["guā"], ["dā"]],
     "呱唧": [["guā"], ["jī"]],
-    "呱呱": [["ɡū"], ["ɡū"]],
+    "呱呱": [["gū"], ["gū"]],
     "寡合": [["guǎ"], ["hé"]],
     "寡妻": [["guǎ"], ["qī"]],
     "挂车": [["guà"], ["chē"]],
@@ -7789,7 +7789,7 @@
     "咔嗒": [["kā"], ["dā"]],
     "咖啡": [["kā"], ["fēi"]],
     "咖喱": [["gā"], ["lí"]],
-    "喀吧": [["kā"], ["bɑ"]],
+    "喀吧": [["kā"], ["ba"]],
     "喀嚓": [["kā"], ["chā"]],
     "卡尺": [["kǎ"], ["chǐ"]],
     "卡车": [["kǎ"], ["chē"]],
@@ -8267,7 +8267,7 @@
     "拉线": [["lā"], ["xiàn"]],
     "拉杂": [["lā"], ["zá"]],
     "拉账": [["lā"], ["zhàng"]],
-    "喇嘛": [["lǎ"], ["mɑ"]],
+    "喇嘛": [["lǎ"], ["ma"]],
     "腊八": [["là"], ["bā"]],
     "腊肠": [["là"], ["cháng"]],
     "腊梅": [["là"], ["méi"]],
@@ -9911,7 +9911,7 @@
     "排版": [["pái"], ["bǎn"]],
     "排笔": [["pái"], ["bǐ"]],
     "排长": [["pái"], ["zhǎng"]],
-    "排场": [["pái"], ["chɑng"]],
+    "排场": [["pái"], ["chang"]],
     "排除": [["pái"], ["chú"]],
     "排挡": [["pái"], ["dǎng"]],
     "排队": [["pái"], ["duì"]],
@@ -11049,7 +11049,7 @@
     "染坊": [["rǎn"], ["fáng"]],
     "攘臂": [["rǎng"], ["bì"]],
     "嚷叫": [["rǎng"], ["jiào"]],
-    "嚷嚷": [["rāng"], ["rɑng"]],
+    "嚷嚷": [["rāng"], ["rang"]],
     "让价": [["ràng"], ["jià"]],
     "让与": [["ràng"], ["yǔ"]],
     "饶有": [["ráo"], ["yǒu"]],
@@ -12597,7 +12597,7 @@
     "缩小": [["suō"], ["xiǎo"]],
     "缩写": [["suō"], ["xiě"]],
     "缩印": [["suō"], ["yìn"]],
-    "所长": [["suǒ"], ["chánɡ"]],
+    "所长": [["suǒ"], ["zhǎng", "cháng"]],
     "缩影": [["suō"], ["yǐng"]],
     "所得": [["suǒ"], ["de"]],
     "所说": [["suǒ"], ["shuō"]],
@@ -13708,7 +13708,7 @@
     "握别": [["wò"], ["bié"]],
     "斡旋": [["wò"], ["xuán"]],
     "乌龟": [["wū"], ["guī"]],
-    "乌拉": [["wù"], ["lɑ"]],
+    "乌拉": [["wù"], ["la"]],
     "乌头": [["wū"], ["tóu"]],
     "乌有": [["wū"], ["yǒu"]],
     "污泥": [["wū"], ["ní"]],
@@ -14469,7 +14469,7 @@
     "新鲜": [["xīn"], ["xiān"]],
     "新兴": [["xīn"], ["xīng"]],
     "新雨": [["xīn"], ["yǔ"]],
-    "新正": [["xīn"], ["zhēnɡ"]],
+    "新正": [["xīn"], ["zhēng"]],
     "新语": [["xīn"], ["yǔ"]],
     "新知": [["xīn"], ["zhī"]],
     "薪传": [["xīn"], ["chuán"]],
@@ -18312,7 +18312,7 @@
     "碧空如洗": [["bì"], ["kōng"], ["rú"], ["xǐ"]],
     "碧落黄泉": [["bì"], ["luò"], ["huáng"], ["quán"]],
     "碧血丹心": [["bì"], ["xuè"], ["dān"], ["xīn"]],
-    "蔽聪塞明": [["bì"], ["cōnɡ"], ["sè"], ["mínɡ"]],
+    "蔽聪塞明": [["bì"], ["cōng"], ["sè"], ["míng"]],
     "蔽明塞聪": [["bì"], ["míng"], ["sè"], ["cōng"]],
     "蔽日干云": [["bì"], ["rì"], ["gān"], ["yún"]],
     "壁间蛇影": [["bì"], ["jiān"], ["shé"], ["yǐng"]],
@@ -20730,7 +20730,7 @@
     "达官贵要": [["dá"], ["guān"], ["guì"], ["yào"]],
     "达官要人": [["dá"], ["guān"], ["yào"], ["rén"]],
     "达官知命": [["dá"], ["guān"], ["zhī"], ["mìng"]],
-    "达赖喇嘛": [["dá"], ["lài"], ["lǎ"], ["mɑ"]],
+    "达赖喇嘛": [["dá"], ["lài"], ["lǎ"], ["ma"]],
     "达姆弹": [["dá"], ["mǔ"], ["dàn"]],
     "达权知变": [["dá"], ["quán"], ["zhī"], ["biàn"]],
     "达人知命": [["dá"], ["rén"], ["zhī"], ["mìng"]],
@@ -21302,7 +21302,7 @@
     "单忧极瘁": [["dān"], ["yōu"], ["jí"], ["cuì"]],
     "单子叶植物": [["dān"], ["zi"], ["yè"], ["zhí"], ["wù"]],
     "担不是": [["dān"], ["bú"], ["shì"]],
-    "担担面": [["dàn"], ["dɑn"], ["miàn"]],
+    "担担面": [["dàn"], ["dan"], ["miàn"]],
     "担惊忍怕": [["dān"], ["jīng"], ["rěn"], ["pà"]],
     "担架队": [["dān"], ["jià"], ["duì"]],
     "担惊受恐": [["dān"], ["jīng"], ["shòu"], ["kǒng"]],
@@ -24410,7 +24410,7 @@
     "鼓睛暴眼": [["gǔ"], ["jīng"], ["bào"], ["yǎn"]],
     "鼓乐喧天": [["gǔ"], ["yuè"], ["xuān"], ["tiān"]],
     "鼓乐齐鸣": [["gǔ"], ["yuè"], ["qí"], ["míng"]],
-    "鼓囊囊": [["gǔ"], ["nāng"], ["nɑng"]],
+    "鼓囊囊": [["gǔ"], ["nāng"], ["nang"]],
     "鼓脑争头": [["gǔ"], ["nǎo"], ["zhēng"], ["tóu"]],
     "鼓旗相当": [["gǔ"], ["qí"], ["xiāng"], ["dāng"]],
     "鼓衰力尽": [["gǔ"], ["shuāi"], ["lì"], ["jìn"]],
@@ -28073,7 +28073,7 @@
     "拉下水": [["lā"], ["xià"], ["shuǐ"]],
     "拉朽摧枯": [["lā"], ["xiǔ"], ["cuī"], ["kū"]],
     "拉洋片": [["lā"], ["yáng"], ["piàn"]],
-    "喇嘛教": [["lǎ"], ["mɑ"], ["jiào"]],
+    "喇嘛教": [["lǎ"], ["ma"], ["jiào"]],
     "腊八粥": [["là"], ["bā"], ["zhōu"]],
     "腊尽春回": [["là"], ["jìn"], ["chūn"], ["huí"]],
     "瘌痢头": [["là"], ["lì"], ["tóu"]],
@@ -29312,7 +29312,7 @@
     "忙中有失": [["máng"], ["zhōng"], ["yǒu"], ["shī"]],
     "芒刺在背": [["máng"], ["cì"], ["zài"], ["bèi"]],
     "芒寒色正": [["máng"], ["hán"], ["sè"], ["zhèng"]],
-    "尨眉皓发": [["mánɡ"], ["méi"], ["hào"], ["fà"]],
+    "尨眉皓发": [["máng"], ["méi"], ["hào"], ["fà"]],
     "盲风怪雨": [["máng"], ["fēng"], ["guài"], ["yǔ"]],
     "盲风暴雨": [["máng"], ["fēng"], ["bào"], ["yǔ"]],
     "盲风妒雨": [["máng"], ["fēng"], ["dù"], ["yǔ"]],
@@ -30155,7 +30155,7 @@
     "闹别扭": [["nào"], ["biè"], ["niǔ"]],
     "闹肚子": [["nào"], ["dǔ"], ["zi"]],
     "闹哄哄": [["nào"], ["hōng"], ["hǒng"]],
-    "闹嚷嚷": [["nào"], ["rāng"], ["rɑng"]],
+    "闹嚷嚷": [["nào"], ["rāng"], ["rang"]],
     "闹意见": [["nào"], ["yì"], ["jiàn"]],
     "闹着玩": [["nào"], ["zhe"], ["wán"]],
     "闹着玩儿": [["nào"], ["zhe"], ["wán"], ["ér"]],
@@ -32828,7 +32828,7 @@
     "少见多怪": [["shǎo"], ["jiàn"], ["duō"], ["guài"]],
     "少林拳": [["shǎo"], ["lín"], ["quán"]],
     "少林寺": [["shǎo"], ["lín"], ["sì"]],
-    "少奶奶": [["shào"], ["nǎi"], ["nɑi"]],
+    "少奶奶": [["shào"], ["nǎi"], ["nai"]],
     "少年犯": [["shào"], ["nián"], ["fàn"]],
     "少年宫": [["shào"], ["nián"], ["gōng"]],
     "少年老成": [["shào"], ["nián"], ["lǎo"], ["chéng"]],
@@ -33785,7 +33785,7 @@
     "耍单儿": [["shuǎ"], ["dān"], ["ér"]],
     "耍滑头": [["shuǎ"], ["huá"], ["tóu"]],
     "耍流氓": [["shuǎ"], ["liú"], ["máng"]],
-    "耍排场": [["shuǎ"], ["pái"], ["chɑng"]],
+    "耍排场": [["shuǎ"], ["pái"], ["chang"]],
     "耍态度": [["shuǎ"], ["tài"], ["dù"]],
     "耍威风": [["shuǎ"], ["wēi"], ["fēng"]],
     "衰当益壮": [["shuāi"], ["dāng"], ["yì"], ["zhuàng"]],
@@ -35670,9 +35670,9 @@
     "乌白马角": [["wū"], ["bái"], ["mǎ"], ["jiǎo"]],
     "乌骨鸡": [["wū"], ["gǔ"], ["jī"]],
     "乌合之众": [["wū"], ["hé"], ["zhī"], ["zhòng"]],
-    "乌拉草": [["wù"], ["lɑ"], ["cǎo"]],
-    "乌拉尔山脉": [["wù"], ["lɑ"], ["ěr"], ["shān"], ["mài"]],
-    "乌拉圭": [["wù"], ["lɑ"], ["guī"]],
+    "乌拉草": [["wù"], ["la"], ["cǎo"]],
+    "乌拉尔山脉": [["wù"], ["la"], ["ěr"], ["shān"], ["mài"]],
+    "乌拉圭": [["wù"], ["la"], ["guī"]],
     "乌溜溜": [["wū"], ["liū"], ["liū"]],
     "乌鲁木齐": [["wū"], ["lǔ"], ["mù"], ["qí"]],
     "乌帽红裙": [["wū"], ["mào"], ["hóng"], ["qún"]],
@@ -36068,7 +36068,7 @@
     "西洋景": [["xī"], ["yáng"], ["jǐng"]],
     "西洋参": [["xī"], ["yáng"], ["shēn"]],
     "西印度群岛": [["xī"], ["yìn"], ["dù"], ["qún"], ["dǎo"]],
-    "吸风饮露": [["xī"], ["fēnɡ"], ["yǐn"], ["lù"]],
+    "吸风饮露": [["xī"], ["fēng"], ["yǐn"], ["lù"]],
     "吸新吐故": [["xī"], ["xīn"], ["tǔ"], ["gù"]],
     "吸铁石": [["xī"], ["tiě"], ["shí"]],
     "吸血鬼": [["xī"], ["xuè"], ["guǐ"]],
@@ -37803,7 +37803,7 @@
     "一毫不染": [["yī"], ["háo"], ["bù"], ["rǎn"]],
     "一轰而散": [["yī"], ["hōng"], ["ér"], ["sàn"]],
     "一呵而就": [["yī"], ["hē"], ["ér"], ["jiù"]],
-    "一哄而散": [["yī"], ["hònɡ"], ["ér"], ["sàn"]],
+    "一哄而散": [["yī"], ["hòng"], ["ér"], ["sàn"]],
     "一哄而起": [["yī"], ["hōng"], ["ér"], ["qǐ"]],
     "一哄而上": [["yì"], ["hōng"], ["ér"], ["shàng"]],
     "一呼百应": [["yī"], ["hū"], ["bǎi"], ["yìng"]],

setup.py

@@ -63,6 +63,7 @@ def long_description():
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',

tools/ipa2ascii.py

@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals
+"""将拼音库中的国际音标字母替换为 ASCII 字母"""
+
+from io import open
+import sys
+
+
+def ipa_map_ascii():
+    return {
+        'ɑ': 'a',
+        'b': 'b',
+        'c': 'c',
+        'd': 'd',
+        'e': 'e',
+        'f': 'f',
+        'ɡ': 'g',
+        'h': 'h',
+        'i': 'i',
+        'j': 'j',
+        'k': 'k',
+        'l': 'l',
+        'm': 'm',
+    }
+
+
+def main(path):
+    with open(path, 'r+', encoding='utf8') as f:
+        new_content = f.read()
+        for ipa, s in ipa_map_ascii().items():
+            new_content = new_content.replace(ipa, s)
+        f.seek(0)
+        f.write(new_content)
+        f.truncate()
+
+if __name__ == '__main__':
+    if len(sys.argv) < 2:
+        sys.exit('Usge: python ipa2ascii.py FILE...')
+    for path in sys.argv[1:]:
+        main(path)

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py33, py34, pypy, py2_jieba, py3_jieba, py2_snownlp, py3_env
+envlist = py26, py27, py33, py34, py35, pypy, py2_jieba, py3_jieba, py2_snownlp, py3_env
 
 [base]
 deps =