Commit Graph

277 Commits (ebd40ed65e09ec918786603fff53fc173c79e96f)
 

Author SHA1 Message Date
ZoeyYoung ebd40ed65e Merge branch 'jieba3k' of https://github.com/ZoeyYoung/jieba into jieba3k 12 years ago
ZoeyYoung d49542c06e fix bug 12 years ago
ZoeyYoung 6024497917 更新 12 years ago
ZoeyYoung dce353f88b merge from master 12 years ago
ZoeyYoung 2857ae45cc Merge branch 'master' into jieba3k
Conflicts:
	Changelog
	jieba/__init__.py
	jieba/finalseg/__init__.py
	jieba/posseg/__init__.py
	setup.py
	test/parallel/test_file.py
	test/test_file.py
12 years ago
Sun Junyi 3667a4ab01 include Changelog & README.md in the distribution package 12 years ago
Sun Junyi 33089138fd Merge branch 'master' of https://github.com/fxsjy/jieba 12 years ago
Sun Junyi d0578ad99b add a license file 12 years ago
Sun Junyi d97c1d584c 0.31 released
pypi update
12 years ago
fxsjy b77645b3aa modify test_file.py; use less memory 12 years ago
fxsjy ed1fa64e27 fix a bug. use sys.version_info.major can't be used in Python2.5 12 years ago
Sun Junyi 0f972df0ac raise exception in case of lower version 12 years ago
Sun Junyi e68bb5a28e fix a compatibility problem;python2.5 has no 'multiprocessing'; 12 years ago
Sun Junyi 689e27280a Merge branch 'master' of https://github.com/fxsjy/jieba 12 years ago
Sun Junyi 9d87e798fd 0.31 release 12 years ago
Sun Junyi 4fad12017e Merge pull request #84 from linkerlin/master
自动检测CPU数目,启动合适数目的进程。
12 years ago
Linker Lin 5d83855088 自动检测CPU数目,启动合适数目的进程。 12 years ago
Linker Lin 1dbc525dff 自动检测CPU数目,启动合适数目的进程。 12 years ago
Linker Lin 2ceb981da0 自动检测CPU数目,启动合适数目的进程。 12 years ago
fxsjy 8e9b4bbe72 fix the compatibility with Python2.5 12 years ago
Sun Junyi d4ede0fee6 hold the backward compatibility, let jython use a special loading workflow 12 years ago
Sun Junyi 8757148d51 Merge pull request #81 from piaolingxue/issue/80/jython_integration
serialize model to file so that it can support jython.
12 years ago
piaolignxue aea8496b1f serialize model to file so that it can support jython. 12 years ago
Sun Junyi 6549deabbd merge change from master 12 years ago
Sun Junyi d691d91674 fix a bug about ImportError 12 years ago
Sun Junyi d63140fe5e make a serial white spaces seperated 12 years ago
Sun Junyi a1ad2cbd55 Merge pull request #75 from chao787/feature_richard
Refactoring jieba/__init__.py
12 years ago
Richard Wong c2ded83ead Refactor: fix line indent to 4.
* jieba/__init__.py (cut):
12 years ago
Richard Wong 99d2492d67 Add re.U flag to re variable. 12 years ago
Richard Wong fbfaac2eaa Reindent function
* jieba/__init__.py (require_initialized):
12 years ago
Richard Wong 7bfd432fc5 Remove the unused imports. 12 years ago
Sun Junyi 7334bedf5c Merge pull request #74 from chgwei/jieba3k
Jieba3k
12 years ago
Cheng wei 6035bb6320 fix invalid syntax for python3 12 years ago
Cheng wei 27cf9cfd62 fix syntax invalid
* python3.2 not support unicode literal
* unicode regex as normal
12 years ago
Sun Junyi 9d0ea771a5 fix bug; decimals & digit-english mixed 12 years ago
Sun Junyi ba5114dc95 update whoosh example 12 years ago
Sun Junyi 4b237f79fa add test/tmp/* into git ignore 12 years ago
Sun Junyi f424862222 clean the files in tmp 12 years ago
Sun Junyi b18d56d2a3 Merge pull request #72 from linkerlin/master
添加一个tmp目录,好让test_whoosh.py可以运行。
12 years ago
Sun Junyi b9b1f1a418 fix conflict of merging 12 years ago
miao.lin becd32b178 made test_whoosh.py happy.
添加一个tmp目录,好让test_whoosh.py可以运行。
12 years ago
Sun Junyi c01680c6a8 merge the new file 12 years ago
Sun Junyi b62f052927 PEP8 12 years ago
Sun Junyi 9ea14a8a54 merge chage from chao78787 12 years ago
Sun Junyi 45daf561c7 follow PEP8: change tab to 4 white spaces 12 years ago
Sun Junyi 632a086035 Merge pull request #71 from chao787/feature_richard
Separate cal and IO process.
12 years ago
Richard Wong 3246236133 Separate cal and IO process. 12 years ago
Sun Junyi e1c1d46324 Update README.md 12 years ago
Sun Junyi 915b3164b0 Update README.md 12 years ago
Sun Junyi 45e6594a09 Update README.md 12 years ago