290 Commits

Author SHA1 Message Date
Sun Junyi
0d99ebce54 Merge pull request #164 from gumblex/jieba3k
Jieba3k v0.32 update
2014-06-15 19:14:28 +08:00
Dingyuan Wang
c04ccd0d12 Update to v0.32 according to the master branch. 2014-06-14 22:31:13 +08:00
Dingyuan Wang
81f77d7a08 Fix the re in enable_parallel. 2014-06-14 15:22:13 +08:00
Sun Junyi
5574304a9e Merge pull request #152 from jagt/jieba3k
close cache file to avoid warning message.
2014-04-29 11:16:41 +08:00
jagt
7f3513edb7 close cache file to avoid warning message. 2014-04-24 00:35:09 +08:00
Sun Junyi
1f144ebf55 Merge pull request #141 from windch/jieba3k
use logging instead of print in __init__ file of py3k branch
2014-03-20 10:27:52 +08:00
wind
7488b114e7 use logging instead of print in init file 2014-03-20 13:48:33 +13:00
fxsjy
5e6a2c4661 fix a bug of add_word 2013-12-05 13:35:40 +08:00
Sun Junyi
0125548a37 Merge pull request #101 from ZoeyYoung/jieba3k
Jieba3k
2013-08-21 18:34:22 -07:00
Zoey Young
510a3d6bed Merge pull request #1 from fxsjy/jieba3k
拉取
2013-08-21 04:47:12 -07:00
ZoeyYoung
25839b5127 fix bug 2013-08-21 19:46:14 +08:00
ZoeyYoung
ebd40ed65e Merge branch 'jieba3k' of https://github.com/ZoeyYoung/jieba into jieba3k 2013-08-21 19:31:30 +08:00
ZoeyYoung
d49542c06e fix bug 2013-08-21 19:31:12 +08:00
ZoeyYoung
6024497917 更新 2013-08-21 19:24:34 +08:00
Sun Junyi
835e68c585 fix bug of merge pull request 2013-08-21 16:01:49 +08:00
Sun Junyi
d16727ba89 Merge pull request #100 from ZoeyYoung/jieba3k
Jieba3k
2013-08-21 00:50:47 -07:00
ZoeyYoung
dce353f88b merge from master 2013-08-21 15:32:46 +08:00
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
2013-08-21 13:55:21 +08:00
Sun Junyi
3667a4ab01 include Changelog & README.md in the distribution package 2013-07-29 13:19:39 +08:00
Sun Junyi
33089138fd Merge branch 'master' of https://github.com/fxsjy/jieba 2013-07-29 12:48:04 +08:00
Sun Junyi
d0578ad99b add a license file 2013-07-29 12:47:47 +08:00
Sun Junyi
d97c1d584c 0.31 released
pypi update
2013-07-29 10:31:52 +08:00
fxsjy
b77645b3aa modify test_file.py; use less memory 2013-07-29 10:17:39 +08:00
fxsjy
ed1fa64e27 fix a bug. use sys.version_info.major can't be used in Python2.5 v0.31 2013-07-29 10:07:55 +08:00
Sun Junyi
0f972df0ac raise exception in case of lower version 2013-07-29 10:01:47 +08:00
Sun Junyi
e68bb5a28e fix a compatibility problem;python2.5 has no 'multiprocessing'; 2013-07-29 09:57:09 +08:00
Sun Junyi
689e27280a Merge branch 'master' of https://github.com/fxsjy/jieba 2013-07-29 09:49:10 +08:00
Sun Junyi
9d87e798fd 0.31 release 2013-07-29 09:48:53 +08:00
Sun Junyi
4fad12017e Merge pull request #84 from linkerlin/master
自动检测CPU数目,启动合适数目的进程。
2013-07-27 20:35:03 -07:00
Linker Lin
5d83855088 自动检测CPU数目,启动合适数目的进程。 2013-07-28 00:12:00 +08:00
Linker Lin
1dbc525dff 自动检测CPU数目,启动合适数目的进程。 2013-07-28 00:10:27 +08:00
Linker Lin
2ceb981da0 自动检测CPU数目,启动合适数目的进程。 2013-07-28 00:07:29 +08:00
fxsjy
8e9b4bbe72 fix the compatibility with Python2.5 2013-07-25 10:25:24 +08:00
Sun Junyi
d4ede0fee6 hold the backward compatibility, let jython use a special loading workflow 2013-07-25 10:08:58 +08:00
Sun Junyi
8757148d51 Merge pull request #81 from piaolingxue/issue/80/jython_integration
serialize model to file so that it can support jython.
2013-07-24 17:00:05 -07:00
piaolignxue
aea8496b1f serialize model to file so that it can support jython. 2013-07-24 22:50:48 +08:00
Sun Junyi
6549deabbd merge change from master 2013-07-16 11:06:41 +08:00
Sun Junyi
d691d91674 fix a bug about ImportError 2013-07-15 09:32:52 +08:00
Sun Junyi
d63140fe5e make a serial white spaces seperated 2013-07-10 17:27:47 +08:00
Sun Junyi
a1ad2cbd55 Merge pull request #75 from chao787/feature_richard
Refactoring jieba/__init__.py
2013-07-10 01:34:43 -07:00
Richard Wong
c2ded83ead Refactor: fix line indent to 4.
* jieba/__init__.py (cut):
2013-07-10 16:22:49 +08:00
Richard Wong
99d2492d67 Add re.U flag to re variable. 2013-07-10 16:22:17 +08:00
Richard Wong
fbfaac2eaa Reindent function
* jieba/__init__.py (require_initialized):
2013-07-08 13:54:36 +08:00
Richard Wong
7bfd432fc5 Remove the unused imports. 2013-07-08 13:51:39 +08:00
Sun Junyi
7334bedf5c Merge pull request #74 from chgwei/jieba3k
Jieba3k
2013-07-05 20:34:12 -07:00
Cheng wei
6035bb6320 fix invalid syntax for python3 2013-07-06 02:52:17 +08:00
Cheng wei
27cf9cfd62 fix syntax invalid
* python3.2 not support unicode literal
* unicode regex as normal
2013-07-06 02:51:13 +08:00
Sun Junyi
9d0ea771a5 fix bug; decimals & digit-english mixed 2013-07-05 16:16:49 +08:00
Sun Junyi
ba5114dc95 update whoosh example 2013-07-04 09:31:09 +08:00
Sun Junyi
4b237f79fa add test/tmp/* into git ignore 2013-07-03 17:56:15 +08:00