Fixed: Addressed PR comments
This commit is contained in:
parent
c99c3fc782
commit
fe3a86d361
|
@ -2,8 +2,6 @@
|
||||||
|
|
||||||
- try to explain what the code is about
|
- try to explain what the code is about
|
||||||
- try to follow [PEP0008](https://www.python.org/dev/peps/pep-0008/)
|
- try to follow [PEP0008](https://www.python.org/dev/peps/pep-0008/)
|
||||||
- make the pull request against the ["v0.6" branch](https://github.com/Bitmessage/PyBitmessage/tree/v0.6)
|
|
||||||
- it should be possible to do a fast-forward merge of the pull requests
|
|
||||||
- PGP-sign the commits included in the pull request
|
- PGP-sign the commits included in the pull request
|
||||||
- try to use a good editor that removes trailing whitespace, highlights potential python issues and uses unix line endings
|
- try to use a good editor that removes trailing whitespace, highlights potential python issues and uses unix line endings
|
||||||
- You can get paid for merged commits if you register at [Tip4Commit](https://tip4commit.com/github/Bitmessage/PyBitmessage)
|
- You can get paid for merged commits if you register at [Tip4Commit](https://tip4commit.com/github/Bitmessage/PyBitmessage)
|
||||||
|
@ -13,3 +11,4 @@ If for some reason you don't want to use github, you can submit the patch using
|
||||||
|
|
||||||
For helping with translations, please use [Transifex](https://www.transifex.com/bitmessage-project/pybitmessage/). There is no need to submit pull requests for translations.
|
For helping with translations, please use [Transifex](https://www.transifex.com/bitmessage-project/pybitmessage/). There is no need to submit pull requests for translations.
|
||||||
For translating technical terms it is recommended to consult the [Microsoft Language Portal](https://www.microsoft.com/Language/en-US/Default.aspx).
|
For translating technical terms it is recommended to consult the [Microsoft Language Portal](https://www.microsoft.com/Language/en-US/Default.aspx).
|
||||||
|
|
||||||
|
|
|
@ -29,3 +29,4 @@ References
|
||||||
* [Installation](https://bitmessage.org/wiki/Compiling_instructions)
|
* [Installation](https://bitmessage.org/wiki/Compiling_instructions)
|
||||||
* [Discuss on Reddit](https://www.reddit.com/r/bitmessage)
|
* [Discuss on Reddit](https://www.reddit.com/r/bitmessage)
|
||||||
* [Chat on Gitter](https://gitter.im/Bitmessage/PyBitmessage)
|
* [Chat on Gitter](https://gitter.im/Bitmessage/PyBitmessage)
|
||||||
|
|
||||||
|
|
|
@ -18,10 +18,7 @@ class ObjectProcessorQueue(Queue.Queue):
|
||||||
Queue.Queue.put(self, item, block, timeout)
|
Queue.Queue.put(self, item, block, timeout)
|
||||||
|
|
||||||
def get(self, block = True, timeout = None):
|
def get(self, block = True, timeout = None):
|
||||||
try:
|
item = Queue.Queue.get(self, block, timeout)
|
||||||
item = Queue.Queue.get(self, block, timeout)
|
|
||||||
except Queue.Empty:
|
|
||||||
raise Queue.Empty()
|
|
||||||
with self.sizeLock:
|
with self.sizeLock:
|
||||||
self.curSize -= len(item[1])
|
self.curSize -= len(item[1])
|
||||||
return item
|
return item
|
||||||
|
|
Loading…
Reference in New Issue
Block a user