Commit Graph

708 Commits

Author SHA1 Message Date
Gregor Robinson
fa53eb370c Clarify IOError handling with comment. 2013-07-11 23:58:10 +01:00
Gregor Robinson
e8fa5aaefe Switch an stderr message to logger. 2013-07-10 20:29:07 +01:00
Gregor Robinson
718de832ab Merge branch 'no_propagate_loggers' into keyfile_perm_fix
Conflicts:
	src/shared.py
2013-07-10 20:24:23 +01:00
Gregor Robinson
32ba57c108 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix 2013-07-10 20:18:10 +01:00
Gregor Robinson
3179ea30f0 These changes slipped from last commit. Sorry. 2013-07-10 20:15:04 +01:00
Gregor Robinson
2e2db97250 Don't propagate loggers; add some logging. 2013-07-10 20:09:27 +01:00
Gregor Robinson
a579e8f1d3 Logging fixes. 2013-07-10 11:43:18 +03:00
Jonathan Warren
eed8c66512 Merge pull request #290 from dpc/master
Tiny building scripts improvements.
2013-07-09 10:08:19 -07:00
Dawid Ciężarkiewicz
e4869514ca Add make uninstall. 2013-07-09 12:19:54 +02:00
Dawid Ciężarkiewicz
2b2fa867f0 Exit if dpkg-buildpackage fails. 2013-07-09 12:19:31 +02:00
Gregor Robinson
1ff1c1b8a5 Spelling. 2013-07-08 23:33:15 +03:00
Gregor Robinson
ebaa1bf346 No paranoid key disable for bad keyfile perms. 2013-07-08 23:21:29 +03:00
Gregor Robinson
f8c955eec0 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix 2013-07-08 22:56:47 +03:00
Jonathan Warren
a3d21dc880 Merge pull request #280 from RemideZ/master
macOSX compatibility
2013-07-05 15:29:07 -07:00
Jonathan Warren
12c3aaceb8 Merge pull request #273 from xj9/logging
Real logging, please incorporate into new and existing code.
2013-07-05 15:16:07 -07:00
Jonathan Warren
d06806c3d4 Merge pull request #287 from Atheros1/master
gevent
2013-07-05 13:59:12 -07:00
Jonathan Warren
21ce1f5a19 manual merge 2013-07-05 16:56:49 -04:00
Jonathan Warren
39f4f85b11 removed apparently unnecessary loop 2013-07-05 16:43:40 -04:00
Jonathan Warren
1f8eee4119 removed apparently unnecessary loop 2013-07-05 16:01:20 -04:00
Jonathan Warren
5f87415395 Merge pull request #281 from pgimeno/cpu100percentfix
Better fix for issue #183
2013-07-02 19:29:04 -07:00
RemideZ
68b2350276 Nicer formatting 2013-07-02 20:25:18 +02:00
Pedro Gimeno
55b899f5c1 Better fix for issue #183
The former patch was too local; this one integrates better with the structure of the code.
2013-07-02 17:43:54 +02:00
RemideZ
2c8ca6623a Update openssl.py 2013-07-02 13:53:35 +02:00
RemideZ
8df9dc5731 Update bitmessagemain.py 2013-07-02 13:52:55 +02:00
RemideZ
8bf8e47cd1 Update __init__.py 2013-07-02 13:52:16 +02:00
Jonathan Warren
2012096673 Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master 2013-07-01 15:51:55 -04:00
Jonathan Warren
b4e292e280 Merge pull request #275 from fuzzgun/master
Altered Makefile to avoid needing to chase changes
2013-07-01 10:10:57 -07:00
Jonathan Warren
e2f9b01558 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-07-01 13:06:13 -04:00
Jonathan Warren
e8f09c2110 Merge pull request #277 from pgimeno/cpu100percentfix
Fix issue #183 (CPU 100% usage)
2013-07-01 10:05:39 -07:00
Pedro Gimeno
95a1afb84b Fix issue #183 (CPU 100% usage)
As per http://docs.python.org/2/howto/sockets.html#using-a-socket it's
possible that a socket recv() call returns 0 bytes if the remote closes
the connection. In that case, recv() does not obey settimeout(): it
just doesn't block and returns zero bytes immediately, which in this
case results in an infinite loop if the transmission was incomplete.
2013-07-01 07:36:22 +02:00
fuzzgun
b038edf2b2 Repairing debian packaging 2013-06-30 16:16:41 +01:00
fuzzgun
3e079787be Altered Makefile to avoid needing to chase changes 2013-06-30 11:17:49 +01:00
Linker Lin
4a84a30fc6 replace acquire lock by 'with' statement 2013-06-30 01:29:35 +08:00
Carlos Killpack
935fe33a47 Real logging, please incorporate into new and existing code. 2013-06-29 10:27:40 -06:00
linkerlin
80e5adad8c Made it compatible with gevent 1.0dev version. 2013-06-28 22:26:31 +08:00
miao.lin
284b3a24f7 Put setDaemon inside init. 2013-06-28 18:22:10 +08:00
miao.lin
9fa90ccc3f Sleep more , save more. 2013-06-28 17:50:43 +08:00
miao.lin
e8eaf65f07 Sleep more , save more. 2013-06-28 17:48:32 +08:00
miao.lin
3eea6d6a88 Removed a blank line. 2013-06-28 17:28:17 +08:00
miao.lin
5df22b4181 Made gevent happy with PyQt. 2013-06-28 16:45:03 +08:00
miao.lin
0aa7efab34 renamed class BGWorker to bgWorker 2013-06-28 15:43:24 +08:00
miao.lin
e47d35769b renamed class BGWorker to bgWorker 2013-06-28 15:36:34 +08:00
miao.lin
6facca4cb3 Added a class for background working 2013-06-28 15:25:31 +08:00
Gregor Robinson
eba0878172 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix 2013-06-27 12:42:18 +00:00
Gregor Robinson
1ed34b0084 Make warning message more specific. 2013-06-27 10:44:49 +00:00
Gregor Robinson
db3120f655 Fix #263 & #262: insecure keyfile permissions.
* Added conditional to keyfile fix code that excludes windows.
* Cleaned up old keyfile permissions fix.
* Added umask (not conditional against Windows, because I don't think that is necessary).
2013-06-27 10:02:52 +00:00
Jonathan Warren
4fd7ff59d3 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-26 14:26:01 -04:00
Jonathan Warren
bfdb04716a Merge pull request #265 from Atheros1/master
Various changes. Now on PyBitmessage v0.3.4
2013-06-26 11:24:56 -07:00
Jonathan Warren
0f8b9f97bd Increment version number to 0.3.4 2013-06-26 14:22:13 -04:00
Jonathan Warren
20994adf78 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-26 14:01:17 -04:00