Merge branch 'v0.6' into playSound

.gitignore

@@ -3,6 +3,7 @@
 **.DS_Store
 src/build
 src/dist
+src/.eggs
 src/.project
 src/.pydevproject
 src/.settings/
@@ -13,3 +14,6 @@ build/lib.*
 build/temp.*
 dist
 *.egg-info
+docs/_*/*
+docs/autodoc/
+pyan/

.travis.yml

@@ -7,6 +7,5 @@ addons:
       - build-essential
       - libcap-dev
 install:
-  - pip install -r requirements.txt
   - python setup.py install
 script: pybitmessage -t

PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,33 @@
-## Code contributions to the Bitmessage project
+## Repository contributions to the PyBitmessage project
 
-- try to explain what the code is about
-- 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)
-- 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
 - You can get paid for merged commits if you register at [Tip4Commit](https://tip4commit.com/github/Bitmessage/PyBitmessage)
 
-If for some reason you don't want to use github, you can submit the patch using Bitmessage to the "bitmessage" chan, or to one of the developers.
+### Code
+
+- Try to refer to github issue tracker or other permanent sources of discussion about the issue.
+- It is clear from the diff *what* you have done, it may be less clear *why* you have done it so explain why this change is necessary rather than what it does
+
+### Documentation
+
+- If there has been a change to the code, there's a good possibility there should be a corresponding change to the documentation 
+- If you can't run `fab build_docs` successfully, ask for someone to run it against your branch
+
+### Tests
+
+- If there has been a change to the code, there's a good possibility there should be a corresponding change to the tests
+- If you can't run `fab tests` successfully, ask for someone to run it against your branch
+
 ## 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 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).
+
+### Gitiquette
+
+- Make the pull request against the ["v0.6" branch](https://github.com/Bitmessage/PyBitmessage/tree/v0.6)
+- PGP-sign the commits included in the pull request
+- Use references to tickets, e.g. `addresses #123` or `fixes #234` in your commit messages
+- Try to use a good editor that removes trailing whitespace, highlights potential python issues and uses unix line endings
+- If for some reason you don't want to use github, you can submit the patch using Bitmessage to the "bitmessage" chan, or to one of the developers.
 

docs/Makefile

@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = PyBitmessage
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/conf.py

@@ -0,0 +1,210 @@
+# -*- coding: utf-8 -*-
+"""
+Configuration file for the Sphinx documentation builder.
+
+This file does only contain a selection of the most common options. For a
+full list see the documentation:
+http://www.sphinx-doc.org/en/master/config
+
+-- Path setup --------------------------------------------------------------
+
+If extensions (or modules to document with autodoc) are in another directory,
+add these directories to sys.path here. If the directory is relative to the
+documentation root, use os.path.abspath to make it absolute, like shown here.
+"""
+
+import os
+import sys
+
+from sphinx.apidoc import main
+from mock import Mock as MagicMock
+
+sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath('../src'))
+sys.path.insert(0, os.path.abspath('../src/pyelliptic'))
+
+import version
+
+
+# -- Project information -----------------------------------------------------
+
+project = u'PyBitmessage'
+copyright = u'2018, The Bitmessage Team'  # pylint: disable=redefined-builtin
+author = u'The Bitmessage Team'
+
+# The short X.Y version
+version = unicode(version.softwareVersion)
+
+# The full version, including alpha/beta/rc tags
+release = version
+
+# -- General configuration ---------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    # 'sphinx.ext.doctest',  # Currently disabled due to bad doctests
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.todo',
+    'sphinx.ext.coverage',
+    'sphinx.ext.imgmath',
+    'sphinx.ext.viewcode',
+    'm2r',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+source_suffix = ['.rst', '.md']
+
+# The master toctree document.
+master_doc = 'index'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path .
+exclude_patterns = [u'_build', 'Thumbs.db', '.DS_Store']
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# The default sidebars (for documents that don't match any pattern) are
+# defined by theme itself.  Builtin themes are using these templates by
+# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
+# 'searchbox.html']``.
+#
+# html_sidebars = {}
+
+# Deal with long lines in source view
+html_theme_options = {
+    'page_width': '1366px',
+}
+
+# -- Options for HTMLHelp output ---------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'PyBitmessagedoc'
+
+
+# -- Options for LaTeX output ------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'PyBitmessage.tex', u'PyBitmessage Documentation',
+     u'The Bitmessage Team', 'manual'),
+]
+
+
+# -- Options for manual page output ------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'pybitmessage', u'PyBitmessage Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output ----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'PyBitmessage', u'PyBitmessage Documentation',
+     author, 'PyBitmessage', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+# -- Options for Epub output -------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+epub_author = author
+epub_publisher = author
+epub_copyright = copyright
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+
+# -- Extension configuration -------------------------------------------------
+
+# -- Options for intersphinx extension ---------------------------------------
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'https://docs.python.org/': None}
+
+# -- Options for todo extension ----------------------------------------------
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = True

docs/contribute.dir/develop.dir/documentation.rst

@@ -0,0 +1,18 @@
+Documentation
+=============
+
+Sphinx is used to pull richly formatted comments out of code, merge them with hand-written documentation and render it
+in HTML and other formats.
+
+To build the docs, simply run `$ fab -H localhost build_docs` once you have set up Fabric.
+
+Restructured Text (RsT) vs MarkDown (md)
+----------------------------------------
+
+There's much on the internet about this. Suffice to say RsT_ is preferred for Python documentation while md is preferred for web markup or for certain other languages.
+
+.. _Rst: [http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html]` style is preferred, 
+
+`md` files can also be incorporated by using mdinclude directives in the indices. They are translated to RsT before rendering to the various formats. Headers are translated as a hard-coded level `(H1: =, H2: -, H3: ^, H4: ~, H5: ", H6: #`.  This represents a small consideration for both styles. If markup is not translated to rst well enough, switch to rst.
+
+

docs/contribute.dir/develop.dir/fabric.rst

@@ -0,0 +1,2 @@
+.. mdinclude:: fabfile/README.md
+

docs/contribute.dir/develop.dir/opsec.rst

@@ -0,0 +1,38 @@
+Operational Security
+====================
+
+Bitmessage has many features that are designed to protect your anonymity during normal use. There are other things that you must or should do if you value your anonymity.
+
+Castles in the sand
+-------------------
+
+You cannot build a strong castle on unstable foundations. If your operating system is not wholly owned by you then it is impossible to make guarantees about an application.
+
+ * Carefully choose your operating system
+ * Ensure your operating system is up to date
+ * Ensure any dependencies and requirements are up to date
+
+Extrordinary claims require extrordinary evidence
+-------------------------------------------------
+
+If we are to make bold claims about protecting your privacy we should demonstrate this by strong actions.
+
+- PGP signed commits
+- looking to audit
+- warrant canary
+
+Digital foootprint
+------------------
+
+Your internet use can reveal metadata you wouldn't expect. This can be connected with other information about you if you're not careful.
+
+ * Use separate addresses for different puprose
+ * Don't make the same mistakes all the time
+ * Your language use is unique. The more you type, the more you fingerprint yourself. The words you know and use often vs the words you don't know or use often.
+
+Cleaning history
+----------------
+
+ * Tell your browser not to store BitMessage addresses
+ * Microsoft Office seems to offer the ability to define sensitive informations types. If browsers don't already they may in the future. Consider adding `BM-\w{x..y}`.
+

docs/contribute.dir/develop.dir/overview.rst

@@ -0,0 +1,88 @@
+Developing 
+==========
+
+Devops tasks
+------------
+
+Bitmessage makes use of fabric_ to define tasks such as building documentation or running checks and tests on the code. If you can install 
+
+.. _fabric: https://fabfile.org
+
+Code style and linters
+----------------------
+
+We aim to be PEP8 compliant but we recognise that we have a long way still to go. Currently we have style and lint exceptions specified at the most specific place we can. We are ignoring certain issues project-wide in order to avoid alert-blindess, avoid style and lint regressions and to allow continuous integration to hook into the output from the tools. While it is hoped that all new changes pass the checks, fixing some existing violations are mini-projects in themselves. Current thinking on ignorable violations is reflected in the options and comments in setup.cfg. Module and line-level lint warnings represent refactoring opportunities.
+
+Pull requests
+-------------
+
+There is a template at PULL_REQUEST_TEMPLATE.md that appears in the pull-request description. Please replace this text with something appropriate to your changes based off the ideas in the template.
+
+Bike-shedding
+-------------
+
+Beyond having well-documented, Pythonic code with static analysis tool checks, extensive test coverage and powerful devops tools, what else can we have? Without violating any linters there is room for making arbirary decisions solely for the sake of project consistency. These are the stuff of the pedant's PR comments. Rather than have such conversations in PR comments, we can lay out the result of discussion here.
+
+I'm putting up a strawman for each topic here, mostly based on my memory of reading related Stack Overflow articles etc. If contributors feel strongly (and we don't have anything better to do) then maybe we can convince each other to update this section.
+
+Trailing vs hanging braces
+   Data
+      Hanging closing brace is preferred, trailing commas always to help reduce churn in diffs
+   Function, class, method args
+      Inline until line-length, then style as per data
+   Nesting
+      Functions
+         Short: group hanging close parentheses 
+         Long: one closing parentheses per line
+
+Single vs double quotes
+   Single quotes are preferred; less strain on the hands, eyes
+
+   Double quotes are only better so as to contain single quotes, but we want to contain doubles as often 
+
+Line continuation
+   Implicit parentheses continuation is preferred
+
+British vs American spelling
+   We should be consistent, it looks like we have American to British at approx 140 to 60 in the code. There's not enough occurrences that we couldn't be consistent one way or the other. It breaks my heart that British spelling could lose this one but I'm happy to 'z' things up for the sake of consistency. So I put forward British to be preferred. Either that strawman wins out, or I incite interest in ~bike-shedding~ guiding the direction of this crucial topic from others.
+
+Dependency graph
+----------------
+
+These images are not very useful right now but the aim is to tweak the settings of one or more of them to be informative, and/or divide them up into smaller grapghs.
+
+To re-build them, run `fab build_docs:dep_graphs=true`. Note that the dot graph takes a lot of time.
+
+.. figure:: ../../../../_static/deps-neato.png
+   :alt: neato graph of dependencies
+   :width: 100 pc
+
+   :index:`Neato` graph of dependencies
+
+.. figure:: ../../../../_static/deps-sfdp.png
+   :alt: SFDP graph of dependencies
+   :width: 100 pc
+   
+   :index:`SFDP` graph of dependencies
+
+.. figure:: ../../../../_static/deps-dot.png
+   :alt: Dot graph of dependencies
+   :width: 100 pc
+
+   :index:`Dot` graph of dependencies
+
+Key management
+--------------
+
+Nitro key
+^^^^^^^^^
+
+Regular contributors are enouraged to take further steps to protect their key and the Nitro Key (Start) is recommended by the BitMessage project for this purpose.
+
+Debian-quirks
+~~~~~~~~~~~~~
+
+Stretch makes use of the directory ~/.gnupg/private-keys-v1.d/ to store the private keys. This simplifies some steps of the Nitro Key instructions. See step 5 of Debian's subkeys_ wiki page
+
+.. _subkeys: https://wiki.debian.org/Subkeys
+

docs/contribute.dir/develop.dir/testing.rst

@@ -0,0 +1,4 @@
+Testing
+=======
+
+Currently there is a Travis job somewhere which runs python setup.py test. This doesn't find any tests when run locally for some reason.

docs/contribute.dir/develop.dir/todo.rst

@@ -0,0 +1,4 @@
+TODO list
+=========
+
+.. todolist::

docs/contribute.dir/develop.rst

@@ -0,0 +1,8 @@
+Developing
+==========
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   develop.dir/*

docs/contribute.dir/processes.rst

@@ -0,0 +1,28 @@
+Processes
+=========
+
+In other to keep the Bitmessage project running the team run a number of systems and accounts that form the 
+development pipeline and continuous delivery process. We are always striving to improve the process. Towards
+that end it is documented here.
+
+
+Project website
+---------------
+
+The bitmessage website_
+
+Github
+------
+
+Our official Github_ account is Bitmessage. Our issue tracker is here as well.
+
+
+BitMessage
+----------
+
+We eat our own dog food! You can send us bug reports via the Bitmessage chan at xxx
+
+
+.. _website: https://bitmessage.org
+.. _Github: https://github.com/Bitmessage/PyBitmessage
+

docs/contribute.rst

@@ -0,0 +1,25 @@
+Contributing
+============
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   contribute.dir/*
+
+
+- Report_
+- Develop_(develop)
+- Translate_
+- Donate_
+- Fork the code and open a PR_ on github
+- Search the `issue tracker` on github or open a  new issue
+- Send bug report to the chan
+
+.. _Report: https://github.com/Bitmessage/PyBitmessage/issues
+.. _Develop: https://github.com/Bitmessage/PyBitmessage
+.. _Translate: https://www.transifex.com/bitmessage-project/pybitmessage/
+.. _Donate: https://tip4commit.com/github/Bitmessage/PyBitmessage
+.. _PR: https://github.com/Bitmessage/PyBitmessage/pulls
+.. _`issue tracker`: https://github.com/Bitmessage/PyBitmessage/issues
+   contributing/*

docs/index.rst

@@ -0,0 +1,15 @@
+.. mdinclude:: ../README.md
+
+.. toctree::
+   :maxdepth: 2
+
+   overview
+   usage
+   contribute
+   
+Indices and tables
+------------------
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

docs/make.bat

@@ -0,0 +1,36 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+set SPHINXPROJ=PyBitmessage
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+
+:end
+popd

docs/usage.rst

@@ -0,0 +1,21 @@
+Usage
+=====
+
+GUI
+---
+
+Bitmessage has a PyQT GUI_
+
+CLI
+---
+
+Bitmessage has a CLI_
+
+API
+---
+
+Bitmessage has an XML-RPC API_
+
+.. _GUI: https://bitmessage.org/wiki/PyBitmessage_Help
+.. _CLI: https://bitmessage.org/wiki/PyBitmessage_Help
+.. _API: https://bitmessage.org/wiki/API_Reference

fabfile/README.md

@@ -85,3 +85,17 @@ Host github
     HostName github.com
     IdentityFile ~/.ssh/id_rsa_github
 ```
+
+# Ideas for further development
+
+## Smaller 
+
+ * Decorators and context managers are useful for accepting common params like verbosity, force or doing command-level help
+ * if `git status` or `git status --staged` produce results, prefer that to generate the file list
+
+
+## Larger
+
+ * Support documentation translations, aim for current transifex'ed languages
+ * Fabric 2 is finally out, go @bitprophet! Invoke/Fabric2 is a rewrite of Fabric supporting Python3. Probably makes
+ sense for us to stick to the battle-hardened 1.x branch, at least until we support Python3.

fabfile/__init__.py

@@ -17,7 +17,7 @@ For more help on a particular command
 
 from fabric.api import env
 
-from fabfile.tasks import code_quality
+from fabfile.tasks import code_quality, build_docs, push_docs, clean
 
 
 # Without this, `fab -l` would display the whole docstring as preamble
@@ -26,6 +26,9 @@ __doc__ = ""
 # This list defines which tasks are made available to the user
 __all__ = [
     "code_quality",
+    "build_docs",
+    "push_docs",
+    "clean",
 ]
 
 # Honour the user's ssh client configuration

fabfile/tasks.py

@@ -2,13 +2,16 @@
 """
 Fabric tasks for PyBitmessage devops operations.
 
-# pylint: disable=not-context-manager
+Note that where tasks declare params to be bools, they use coerce_bool() and so will accept any commandline (string)
+representation of true or false that coerce_bool() understands.
+
 """
 
 import os
 import sys
 
-from fabric.api import run, task, hide, cd
+from fabric.api import run, task, hide, cd, settings, sudo
+from fabric.contrib.project import rsync_project
 from fabvenv import virtualenv
 
 from fabfile.lib import (
@@ -16,6 +19,9 @@ from fabfile.lib import (
     get_filtered_pycodestyle_output, get_filtered_flake8_output, get_filtered_pylint_output,
 )
 
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'src')))  # noqa:E402
+from version import softwareVersion  # pylint: disable=wrong-import-position
+
 
 def get_tool_results(file_list):
     """Take a list of files and resuln the results of applying the tools"""
@@ -28,9 +34,9 @@ def get_tool_results(file_list):
         result['pylint_violations'] = get_filtered_pylint_output(path_to_file)
         result['path_to_file'] = path_to_file
         result['total_violations'] = sum([
-                len(result['pycodestyle_violations']),
-                len(result['flake8_violations']),
-                len(result['pylint_violations']),
+            len(result['pycodestyle_violations']),
+            len(result['flake8_violations']),
+            len(result['pylint_violations']),
         ])
         results.append(result)
     return results
@@ -116,6 +122,43 @@ def generate_file_list(filename):
     return file_list
 
 
+def create_dependency_graphs():
+    """
+    To better understand the relationship between methods, dependency graphs can be drawn between functions and
+    methods.
+
+    Since the resulting images are large and could be out of date on the next commit, storing them in the repo is
+    pointless. Instead, it makes sense to build a dependency graph for a particular, documented version of the code.
+
+    .. todo:: Consider saving a hash of the intermediate dotty file so unnecessary image generation can be avoided.
+
+    """
+    with virtualenv(VENV_ROOT):
+        with hide('running', 'stdout'):
+
+            # .. todo:: consider a better place to put this, use a particular commit
+            with cd(PROJECT_ROOT):
+                with settings(warn_only=True):
+                    if run('stat pyan').return_code:
+                        run('git clone https://github.com/davidfraser/pyan.git')
+            with cd(os.path.join(PROJECT_ROOT, 'pyan')):
+                run('git checkout pre-python3')
+
+            # .. todo:: Use better settings. This is MVP to make a diagram
+            with cd(PROJECT_ROOT):
+                file_list = run("find . -type f -name '*.py' ! -path './src/.eggs/*'").split('\r\n')
+                for cmd in [
+                        'neato -Goverlap=false -Tpng > deps-neato.png',
+                        'sfdp -Goverlap=false -Tpng > deps-sfdp.png',
+                        'dot -Goverlap=false -Tpng > deps-dot.png',
+                ]:
+                    pyan_cmd = './pyan/pyan.py {} --dot'.format(' '.join(file_list))
+                    sed_cmd = r"sed s'/http\-old/http_old/'g"  # dot doesn't like dashes
+                    run('|'.join([pyan_cmd, sed_cmd, cmd]))
+
+                run('mv *.png docs/_build/html/_static/')
+
+
 @task
 def code_quality(verbose=True, details=False, fix=False, filename=None, top=10):
     """
@@ -136,11 +179,9 @@ def code_quality(verbose=True, details=False, fix=False, filename=None, top=10):
     :type details: bool, default False
     :param fix: Run autopep8 aggressively on the displayed file(s)
     :type fix: bool, default False
-    :param filename: Rather than analysing all files and displaying / fixing the top N, just analyse / display / fix
-    the specified file
+    :param filename: Don't test/fix the top N, just the specified file
     :type filename: string, valid path to a file, default all files in the project
-    :return: This fabric task has an exit status equal to the total number of violations and uses stdio but it does
-    not return anything if you manage to call it successfully from Python
+    :return: None, exit status equals total number of violations
     :rtype: None
 
     Intended to be temporary until we have improved code quality and have safeguards to maintain it in place.
@@ -163,3 +204,93 @@ def code_quality(verbose=True, details=False, fix=False, filename=None, top=10):
 
     print_results(results, top, verbose, details)
     sys.exit(sum([item['total_violations'] for item in results]))
+
+
+@task
+def build_docs(dep_graph=False, apidoc=True):
+    """
+    Build the documentation locally.
+
+    :param dep_graph: Build the dependency graphs
+    :type dep_graph: Bool, default False
+    :param apidoc: Build the automatically generated rst files from the source code
+    :type apidoc: Bool, default True
+
+    Default usage:
+
+        $ fab -H localhost build_docs
+
+    Implementation:
+
+    First, a dependency graph is generated and converted into an image that is referenced in the development page.
+
+    Next, the sphinx-apidoc command is (usually) run which searches the code. As part of this it loads the modules and
+    if this has side-effects then they will be evident. Any documentation strings that make use of Python documentation
+    conventions (like parameter specification) or the Restructured Text (RsT) syntax will be extracted.
+
+    Next, the `make html` command is run to generate HTML output. Other formats (epub, pdf) are available.
+
+    .. todo:: support other languages
+
+    """
+
+    apidoc = coerce_bool(apidoc)
+
+    if coerce_bool(dep_graph):
+        create_dependency_graphs()
+
+    with virtualenv(VENV_ROOT):
+        with hide('running'):
+
+            apidoc_result = 0
+            if apidoc:
+                run('mkdir -p {}'.format(os.path.join(PROJECT_ROOT, 'docs', 'autodoc')))
+                with cd(os.path.join(PROJECT_ROOT, 'docs', 'autodoc')):
+                    with settings(warn_only=True):
+                        run('rm *.rst')
+                with cd(os.path.join(PROJECT_ROOT, 'docs')):
+                    apidoc_result = run('sphinx-apidoc -o autodoc ..').return_code
+
+            with cd(os.path.join(PROJECT_ROOT, 'docs')):
+                make_result = run('make html').return_code
+                return_code = apidoc_result + make_result
+
+    sys.exit(return_code)
+
+
+@task
+def push_docs(path=None):
+    """
+    Upload the generated docs to a public server.
+
+    Default usage:
+
+        $ fab -H localhost push_docs
+
+    .. todo:: support other languages
+    .. todo:: integrate with configuration management data to get web root and webserver restart command
+
+    """
+
+    # Making assumptions
+    WEB_ROOT = path if path is not None else os.path.join('var', 'www', 'html', 'pybitmessage', 'en', 'latest')
+    VERSION_ROOT = os.path.join(os.path.dirname(WEB_ROOT), softwareVersion)
+
+    rsync_project(
+        remote_dir=VERSION_ROOT,
+        local_dir=os.path.join(PROJECT_ROOT, 'docs', '_build', 'html')
+    )
+    result = run('ln -sf {0} {1}'.format(WEB_ROOT, VERSION_ROOT))
+    if result.return_code:
+        print 'Linking the new release failed'
+
+    # More assumptions
+    sudo('systemctl restart apache2')
+
+
+@task
+def clean():
+    """Clean up files generated by fabric commands."""
+    with hide('running', 'stdout'):
+        with cd(PROJECT_ROOT):
+            run(r"find . -name '*.pyc' -exec rm '{}' \;")

setup.py

@@ -15,7 +15,14 @@ EXTRAS_REQUIRE = {
     'pyopencl': ['pyopencl'],
     'prctl': ['python_prctl'],  # Named threads
     'qrcode': ['qrcode'],
-    'sound;platform_system=="Windows"': ['winsound']
+    'sound;platform_system=="Windows"': ['winsound'],
+    'docs': [
+        'sphinx',  # fab build_docs
+        'graphviz',  # fab build_docs
+        'curses',  # src/depends.py
+        'python2-pythondialog',  # src/depends.py
+        'm2r',  # fab build_docs
+    ],
 }
 
 

src/api_client.py

@@ -5,66 +5,68 @@ import xmlrpclib
 import json
 import time
 
-api = xmlrpclib.ServerProxy("http://bradley:password@localhost:8442/")
+if __name__ == '__main__':
 
-print 'Let\'s test the API first.'
-inputstr1 = "hello"
-inputstr2 = "world"
-print api.helloWorld(inputstr1, inputstr2)
-print api.add(2,3)
+    api = xmlrpclib.ServerProxy("http://bradley:password@localhost:8442/")
 
-print 'Let\'s set the status bar message.'
-print api.statusBar("new status bar message")
+    print 'Let\'s test the API first.'
+    inputstr1 = "hello"
+    inputstr2 = "world"
+    print api.helloWorld(inputstr1, inputstr2)
+    print api.add(2,3)
 
-print 'Let\'s list our addresses:'
-print api.listAddresses()
+    print 'Let\'s set the status bar message.'
+    print api.statusBar("new status bar message")
 
-print 'Let\'s list our address again, but this time let\'s parse the json data into a Python data structure:'
-jsonAddresses = json.loads(api.listAddresses())
-print jsonAddresses
-print 'Now that we have our address data in a nice Python data structure, let\'s look at the first address (index 0) and print its label:'
-print jsonAddresses['addresses'][0]['label']
+    print 'Let\'s list our addresses:'
+    print api.listAddresses()
 
-print 'Uncomment the next two lines to create a new random address with a slightly higher difficulty setting than normal.'
-#addressLabel = 'new address label'.encode('base64')
-#print api.createRandomAddress(addressLabel,False,1.05,1.1111)
+    print 'Let\'s list our address again, but this time let\'s parse the json data into a Python data structure:'
+    jsonAddresses = json.loads(api.listAddresses())
+    print jsonAddresses
+    print 'Now that we have our address data in a nice Python data structure, let\'s look at the first address (index 0) and print its label:'
+    print jsonAddresses['addresses'][0]['label']
 
-print 'Uncomment these next four lines to create new deterministic addresses.'
-#passphrase = 'asdfasdfqwser'.encode('base64')
-#jsonDeterministicAddresses = api.createDeterministicAddresses(passphrase, 2, 4, 1, False)
-#print jsonDeterministicAddresses
-#print json.loads(jsonDeterministicAddresses)
+    print 'Uncomment the next two lines to create a new random address with a slightly higher difficulty setting than normal.'
+    #addressLabel = 'new address label'.encode('base64')
+    #print api.createRandomAddress(addressLabel,False,1.05,1.1111)
 
-#print 'Uncomment this next line to print the first deterministic address that would be generated with the given passphrase. This will Not add it to the Bitmessage interface or the keys.dat file.'
-#print api.getDeterministicAddress('asdfasdfqwser'.encode('base64'),4,1)
+    print 'Uncomment these next four lines to create new deterministic addresses.'
+    #passphrase = 'asdfasdfqwser'.encode('base64')
+    #jsonDeterministicAddresses = api.createDeterministicAddresses(passphrase, 2, 4, 1, False)
+    #print jsonDeterministicAddresses
+    #print json.loads(jsonDeterministicAddresses)
 
-#print 'Uncomment this line to subscribe to an address. (You must use your own address, this one is invalid).'
-#print api.addSubscription('2D94G5d8yp237GGqAheoecBYpdehdT3dha','test sub'.encode('base64'))
+    #print 'Uncomment this next line to print the first deterministic address that would be generated with the given passphrase. This will Not add it to the Bitmessage interface or the keys.dat file.'
+    #print api.getDeterministicAddress('asdfasdfqwser'.encode('base64'),4,1)
 
-#print 'Uncomment this line to unsubscribe from an address.'
-#print api.deleteSubscription('2D94G5d8yp237GGqAheoecBYpdehdT3dha')
+    #print 'Uncomment this line to subscribe to an address. (You must use your own address, this one is invalid).'
+    #print api.addSubscription('2D94G5d8yp237GGqAheoecBYpdehdT3dha','test sub'.encode('base64'))
 
-print 'Let\'s now print all of our inbox messages:'
-print api.getAllInboxMessages()
-inboxMessages = json.loads(api.getAllInboxMessages())
-print inboxMessages
+    #print 'Uncomment this line to unsubscribe from an address.'
+    #print api.deleteSubscription('2D94G5d8yp237GGqAheoecBYpdehdT3dha')
 
-print 'Uncomment this next line to decode the actual message data in the first message:'
-#print inboxMessages['inboxMessages'][0]['message'].decode('base64')
+    print 'Let\'s now print all of our inbox messages:'
+    print api.getAllInboxMessages()
+    inboxMessages = json.loads(api.getAllInboxMessages())
+    print inboxMessages
 
-print 'Uncomment this next line in the code to delete a message'
-#print api.trashMessage('584e5826947242a82cb883c8b39ac4a14959f14c228c0fbe6399f73e2cba5b59')
+    print 'Uncomment this next line to decode the actual message data in the first message:'
+    #print inboxMessages['inboxMessages'][0]['message'].decode('base64')
 
-print 'Uncomment these lines to send a message. The example addresses are invalid; you will have to put your own in.'
-#subject = 'subject!'.encode('base64')
-#message = 'Hello, this is the message'.encode('base64')
-#ackData = api.sendMessage('BM-Gtsm7PUabZecs3qTeXbNPmqx3xtHCSXF', 'BM-2DCutnUZG16WiW3mdAm66jJUSCUv88xLgS', subject,message)
-#print 'The ackData is:', ackData
-#while True:
-#    time.sleep(2)
-#    print 'Current status:', api.getStatus(ackData)
+    print 'Uncomment this next line in the code to delete a message'
+    #print api.trashMessage('584e5826947242a82cb883c8b39ac4a14959f14c228c0fbe6399f73e2cba5b59')
 
-print 'Uncomment these lines to send a broadcast. The example address is invalid; you will have to put your own in.'
-#subject = 'subject within broadcast'.encode('base64')
-#message = 'Hello, this is the message within a broadcast.'.encode('base64')
-#print api.sendBroadcast('BM-onf6V1RELPgeNN6xw9yhpAiNiRexSRD4e', subject,message)
+    print 'Uncomment these lines to send a message. The example addresses are invalid; you will have to put your own in.'
+    #subject = 'subject!'.encode('base64')
+    #message = 'Hello, this is the message'.encode('base64')
+    #ackData = api.sendMessage('BM-Gtsm7PUabZecs3qTeXbNPmqx3xtHCSXF', 'BM-2DCutnUZG16WiW3mdAm66jJUSCUv88xLgS', subject,message)
+    #print 'The ackData is:', ackData
+    #while True:
+    #    time.sleep(2)
+    #    print 'Current status:', api.getStatus(ackData)
+
+    print 'Uncomment these lines to send a broadcast. The example address is invalid; you will have to put your own in.'
+    #subject = 'subject within broadcast'.encode('base64')
+    #message = 'Hello, this is the message within a broadcast.'.encode('base64')
+    #print api.sendBroadcast('BM-onf6V1RELPgeNN6xw9yhpAiNiRexSRD4e', subject,message)

src/bitmessageqt/__init__.py

@@ -1,9 +1,5 @@
-# pylint: disable=too-many-lines,broad-except,too-many-instance-attributes,global-statement,too-few-public-methods
-# pylint: disable=too-many-statements,too-many-branches,attribute-defined-outside-init,too-many-arguments,no-member
-# pylint: disable=unused-argument,no-self-use,too-many-locals,unused-variable,too-many-nested-blocks
-# pylint: disable=too-many-return-statements,protected-access,super-init-not-called,non-parent-init-called
 """
-Initialise the QT interface
+PyQt based UI for bitmessage, the main module
 """
 
 import hashlib
@@ -15,64 +11,51 @@ import sys
 import textwrap
 import time
 from datetime import datetime, timedelta
+from sqlite3 import register_adapter
+
+from PyQt4 import QtCore, QtGui
+from PyQt4.QtNetwork import QLocalSocket, QLocalServer
 
-import debug
 from debug import logger
-
-
-try:
-    from PyQt4 import QtCore, QtGui
-    from PyQt4.QtNetwork import QLocalSocket, QLocalServer
-except ImportError:
-    logmsg = (
-        'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can'
-        ' download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for '
-        '\'PyQt Download\' (without quotes).'
-    )
-    logger.critical(logmsg, exc_info=True)
-    sys.exit()
-
-
-from sqlite3 import register_adapter  # pylint: disable=wrong-import-order
-
+from tr import _translate
+from addresses import decodeAddress, addBMIfNotPresent
+import shared
+from bitmessageui import Ui_MainWindow
+from bmconfigparser import BMConfigParser
 import defaults
+from namecoin import namecoinConnection
+from messageview import MessageView
+from migrationwizard import Ui_MigrationWizard
+from foldertree import (
+    AccountMixin, Ui_FolderWidget, Ui_AddressWidget, Ui_SubscriptionWidget,
+    MessageList_AddressWidget, MessageList_SubjectWidget,
+    Ui_AddressBookWidgetItemLabel, Ui_AddressBookWidgetItemAddress)
+from settings import Ui_settingsDialog
+import settingsmixin
+import support
+import debug
+from helper_ackPayload import genAckPayload
+from helper_sql import sqlQuery, sqlExecute, sqlExecuteChunked, sqlStoredProcedure
 import helper_search
-import knownnodes
 import l10n
 import openclpow
+from utils import str_broadcast_subscribers, avatarize
+from account import (
+    getSortedAccounts, getSortedSubscriptions, accountClass, BMAccount,
+    GatewayAccount, MailchuckAccount, AccountColor)
+import dialogs
+from helper_generic import powQueueSize
+from network.stats import pendingDownload, pendingUpload
+from uisignaler import UISignaler
+import knownnodes
 import paths
+from proofofwork import getPowType
 import queues
-import shared
 import shutdown
 import state
-import upnp
-
-from bitmessageqt import sound, support, dialogs
-from bitmessageqt.foldertree import (
-    AccountMixin, Ui_FolderWidget, Ui_AddressWidget, Ui_SubscriptionWidget, MessageList_AddressWidget,
-    MessageList_SubjectWidget, Ui_AddressBookWidgetItemLabel, Ui_AddressBookWidgetItemAddress,
-)
-from bitmessageqt.account import (
-    getSortedAccounts, getSortedSubscriptions, accountClass, BMAccount, GatewayAccount, MailchuckAccount, AccountColor,
-)
-from bitmessageqt.bitmessageui import Ui_MainWindow, settingsmixin
-from bitmessageqt.messageview import MessageView
-from bitmessageqt.migrationwizard import Ui_MigrationWizard
-from bitmessageqt.settings import Ui_settingsDialog
-from bitmessageqt.utils import str_broadcast_subscribers, avatarize
-from bitmessageqt.uisignaler import UISignaler
-from bitmessageqt.statusbar import BMStatusBar
-
-from addresses import decodeAddress, addBMIfNotPresent
-from bmconfigparser import BMConfigParser
-from namecoin import namecoinConnection
-from helper_ackPayload import genAckPayload
-from helper_generic import powQueueSize
-from helper_sql import sqlQuery, sqlExecute, sqlExecuteChunked, sqlStoredProcedure
-from network.stats import pendingDownload, pendingUpload
+from statusbar import BMStatusBar
 from network.asyncore_pollchoose import set_rates
-from proofofwork import getPowType
-from tr import _translate
+import sound
 
 
 try:
@@ -81,15 +64,8 @@ except ImportError:
     get_plugins = False
 
 
-qmytranslator = None
-qsystranslator = None
-
-
 def change_translation(newlocale):
-    """Change a translation to a new locale"""
-
     global qmytranslator, qsystranslator
-
     try:
         if not qmytranslator.isEmpty():
             QtGui.QApplication.removeTranslator(qmytranslator)
@@ -102,16 +78,15 @@ def change_translation(newlocale):
         pass
 
     qmytranslator = QtCore.QTranslator()
-    translationpath = os.path.join(paths.codePath(), 'translations', 'bitmessage_' + newlocale)
+    translationpath = os.path.join (paths.codePath(), 'translations', 'bitmessage_' + newlocale)
     qmytranslator.load(translationpath)
     QtGui.QApplication.installTranslator(qmytranslator)
 
     qsystranslator = QtCore.QTranslator()
     if paths.frozen:
-        translationpath = os.path.join(paths.codePath(), 'translations', 'qt_' + newlocale)
+        translationpath = os.path.join (paths.codePath(), 'translations', 'qt_' + newlocale)
     else:
-        translationpath = os.path.join(str(QtCore.QLibraryInfo.location(
-            QtCore.QLibraryInfo.TranslationsPath)), 'qt_' + newlocale)
+        translationpath = os.path.join (str(QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath)), 'qt_' + newlocale)
     qsystranslator.load(translationpath)
     QtGui.QApplication.installTranslator(qsystranslator)
 
@@ -132,8 +107,7 @@ def change_translation(newlocale):
             logger.error("Failed to set locale to %s", lang, exc_info=True)
 
 
-class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-methods
-    """TBC"""
+class MyForm(settingsmixin.SMainWindow):
 
     # the last time that a message arrival sound was played
     lastSoundTime = datetime.now() - timedelta(days=1)
@@ -145,8 +119,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
     REPLY_TYPE_CHAN = 1
 
     def init_file_menu(self):
-        """Initialise the file menu"""
-
         QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL(
             "triggered()"), self.quit)
         QtCore.QObject.connect(self.ui.actionNetworkSwitch, QtCore.SIGNAL(
@@ -161,10 +133,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                                QtCore.SIGNAL(
                                    "triggered()"),
                                self.click_actionRegenerateDeterministicAddresses)
-        QtCore.QObject.connect(
-            self.ui.pushButtonAddChan,
-            QtCore.SIGNAL("clicked()"),
-            self.click_actionJoinChan)  # also used for creating chans.
+        QtCore.QObject.connect(self.ui.pushButtonAddChan, QtCore.SIGNAL(
+            "clicked()"),
+                               self.click_actionJoinChan) # also used for creating chans.
         QtCore.QObject.connect(self.ui.pushButtonNewAddress, QtCore.SIGNAL(
             "clicked()"), self.click_NewAddressDialog)
         QtCore.QObject.connect(self.ui.pushButtonAddAddressBook, QtCore.SIGNAL(
@@ -189,8 +160,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             "triggered()"), self.click_actionHelp)
 
     def init_inbox_popup_menu(self, connectSignal=True):
-        """Popup menu for the Inbox tab"""
-
+        # Popup menu for the Inbox tab
         self.ui.inboxContextMenuToolbar = QtGui.QToolBar()
         # Actions
         self.actionReply = self.ui.inboxContextMenuToolbar.addAction(_translate(
@@ -227,28 +197,24 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.ui.tableWidgetInbox.setContextMenuPolicy(
             QtCore.Qt.CustomContextMenu)
         if connectSignal:
-            self.connect(
-                self.ui.tableWidgetInbox,
-                QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'),
-                self.on_context_menuInbox)
+            self.connect(self.ui.tableWidgetInbox, QtCore.SIGNAL(
+                'customContextMenuRequested(const QPoint&)'),
+                        self.on_context_menuInbox)
         self.ui.tableWidgetInboxSubscriptions.setContextMenuPolicy(
             QtCore.Qt.CustomContextMenu)
         if connectSignal:
-            self.connect(
-                self.ui.tableWidgetInboxSubscriptions,
-                QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'),
-                self.on_context_menuInbox)
+            self.connect(self.ui.tableWidgetInboxSubscriptions, QtCore.SIGNAL(
+                'customContextMenuRequested(const QPoint&)'),
+                        self.on_context_menuInbox)
         self.ui.tableWidgetInboxChans.setContextMenuPolicy(
             QtCore.Qt.CustomContextMenu)
         if connectSignal:
-            self.connect(
-                self.ui.tableWidgetInboxChans,
-                QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'),
-                self.on_context_menuInbox)
+            self.connect(self.ui.tableWidgetInboxChans, QtCore.SIGNAL(
+                'customContextMenuRequested(const QPoint&)'),
+                        self.on_context_menuInbox)
 
     def init_identities_popup_menu(self, connectSignal=True):
-        """Popup menu for the Your Identities tab"""
-
+        # Popup menu for the Your Identities tab
         self.ui.addressContextMenuToolbarYourIdentities = QtGui.QToolBar()
         # Actions
         self.actionNewYourIdentities = self.ui.addressContextMenuToolbarYourIdentities.addAction(_translate(
@@ -283,10 +249,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.ui.treeWidgetYourIdentities.setContextMenuPolicy(
             QtCore.Qt.CustomContextMenu)
         if connectSignal:
-            self.connect(
-                self.ui.treeWidgetYourIdentities,
-                QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'),
-                self.on_context_menuYourIdentities)
+            self.connect(self.ui.treeWidgetYourIdentities, QtCore.SIGNAL(
+                'customContextMenuRequested(const QPoint&)'),
+                        self.on_context_menuYourIdentities)
 
         # load all gui.menu plugins with prefix 'address'
         self.menu_plugins = {'address': []}
@@ -301,8 +266,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 ))
 
     def init_chan_popup_menu(self, connectSignal=True):
-        """Popup menu for the Channels tab"""
-
+        # Popup menu for the Channels tab
         self.ui.addressContextMenuToolbar = QtGui.QToolBar()
         # Actions
         self.actionNew = self.ui.addressContextMenuToolbar.addAction(_translate(
@@ -332,14 +296,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.ui.treeWidgetChans.setContextMenuPolicy(
             QtCore.Qt.CustomContextMenu)
         if connectSignal:
-            self.connect(
-                self.ui.treeWidgetChans,
-                QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'),
-                self.on_context_menuChan)
+            self.connect(self.ui.treeWidgetChans, QtCore.SIGNAL(
+                'customContextMenuRequested(const QPoint&)'),
+                        self.on_context_menuChan)
 
     def init_addressbook_popup_menu(self, connectSignal=True):
-        """Popup menu for the Address Book page"""
-
+        # Popup menu for the Address Book page
         self.ui.addressBookContextMenuToolbar = QtGui.QToolBar()
         # Actions
         self.actionAddressBookSend = self.ui.addressBookContextMenuToolbar.addAction(
@@ -371,14 +333,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.ui.tableWidgetAddressBook.setContextMenuPolicy(
             QtCore.Qt.CustomContextMenu)
         if connectSignal:
-            self.connect(
-                self.ui.tableWidgetAddressBook,
-                QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'),
-                self.on_context_menuAddressBook)
+            self.connect(self.ui.tableWidgetAddressBook, QtCore.SIGNAL(
+                'customContextMenuRequested(const QPoint&)'),
+                        self.on_context_menuAddressBook)
 
     def init_subscriptions_popup_menu(self, connectSignal=True):
-        """Popup menu for the Subscriptions page"""
-
+        # Popup menu for the Subscriptions page
         self.ui.subscriptionsContextMenuToolbar = QtGui.QToolBar()
         # Actions
         self.actionsubscriptionsNew = self.ui.subscriptionsContextMenuToolbar.addAction(
@@ -401,14 +361,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.ui.treeWidgetSubscriptions.setContextMenuPolicy(
             QtCore.Qt.CustomContextMenu)
         if connectSignal:
-            self.connect(
-                self.ui.treeWidgetSubscriptions,
-                QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'),
-                self.on_context_menuSubscriptions)
+            self.connect(self.ui.treeWidgetSubscriptions, QtCore.SIGNAL(
+                'customContextMenuRequested(const QPoint&)'),
+                        self.on_context_menuSubscriptions)
 
     def init_sent_popup_menu(self, connectSignal=True):
-        """Popup menu for the Sent page"""
-
+        # Popup menu for the Sent page
         self.ui.sentContextMenuToolbar = QtGui.QToolBar()
         # Actions
         self.actionTrashSentMessage = self.ui.sentContextMenuToolbar.addAction(
@@ -421,10 +379,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.actionForceSend = self.ui.sentContextMenuToolbar.addAction(
             _translate(
                 "MainWindow", "Force send"), self.on_action_ForceSend)
+        # self.popMenuSent = QtGui.QMenu( self )
+        # self.popMenuSent.addAction( self.actionSentClipboard )
+        # self.popMenuSent.addAction( self.actionTrashSentMessage )
 
     def rerenderTabTreeSubscriptions(self):
-        """TBC"""
-
         treeWidget = self.ui.treeWidgetSubscriptions
         folders = Ui_FolderWidget.folderWeight.keys()
         folders.remove("new")
@@ -434,16 +393,17 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             treeWidget.header().setSortIndicator(
                 0, QtCore.Qt.AscendingOrder)
         # init dictionary
-
+        
         db = getSortedSubscriptions(True)
         for address in db:
             for folder in folders:
-                if folder not in db[address]:
+                if not folder in db[address]:
                     db[address][folder] = {}
-
+            
         if treeWidget.isSortingEnabled():
             treeWidget.setSortingEnabled(False)
 
+        widgets = {}
         i = 0
         while i < treeWidget.topLevelItemCount():
             widget = treeWidget.topLevelItem(i)
@@ -451,8 +411,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 toAddress = widget.address
             else:
                 toAddress = None
-
-            if toAddress not in db:
+            
+            if not toAddress in db:
                 treeWidget.takeTopLevelItem(i)
                 # no increment
                 continue
@@ -471,7 +431,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 j += 1
 
             # add missing folders
-            if db[toAddress]:
+            if len(db[toAddress]) > 0:
                 j = 0
                 for f, c in db[toAddress].iteritems():
                     try:
@@ -482,14 +442,10 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             widget.setUnreadCount(unread)
             db.pop(toAddress, None)
             i += 1
-
+        
         i = 0
         for toAddress in db:
-            widget = Ui_SubscriptionWidget(
-                treeWidget, i, toAddress,
-                db[toAddress]["inbox"]['count'],
-                db[toAddress]["inbox"]['label'],
-                db[toAddress]["inbox"]['enabled'])
+            widget = Ui_SubscriptionWidget(treeWidget, i, toAddress, db[toAddress]["inbox"]['count'], db[toAddress]["inbox"]['label'], db[toAddress]["inbox"]['enabled'])
             j = 0
             unread = 0
             for folder in folders:
@@ -501,28 +457,23 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 j += 1
             widget.setUnreadCount(unread)
             i += 1
-
+        
         treeWidget.setSortingEnabled(True)
 
-    def rerenderTabTreeMessages(self):
-        """TBC"""
 
+    def rerenderTabTreeMessages(self):
         self.rerenderTabTree('messages')
 
     def rerenderTabTreeChans(self):
-        """TBC"""
-
         self.rerenderTabTree('chan')
-
+        
     def rerenderTabTree(self, tab):
-        """TBC"""
-
         if tab == 'messages':
             treeWidget = self.ui.treeWidgetYourIdentities
         elif tab == 'chan':
             treeWidget = self.ui.treeWidgetChans
         folders = Ui_FolderWidget.folderWeight.keys()
-
+        
         # sort ascending when creating
         if treeWidget.topLevelItemCount() == 0:
             treeWidget.header().setSortIndicator(
@@ -530,12 +481,14 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         # init dictionary
         db = {}
         enabled = {}
-
+        
         for toAddress in getSortedAccounts():
             isEnabled = BMConfigParser().getboolean(
                 toAddress, 'enabled')
             isChan = BMConfigParser().safeGetBoolean(
                 toAddress, 'chan')
+            isMaillinglist = BMConfigParser().safeGetBoolean(
+                toAddress, 'mailinglist')
 
             if treeWidget == self.ui.treeWidgetYourIdentities:
                 if isChan:
@@ -547,13 +500,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             db[toAddress] = {}
             for folder in folders:
                 db[toAddress][folder] = 0
-
+                
             enabled[toAddress] = isEnabled
 
         # get number of (unread) messages
         total = 0
-        queryreturn = sqlQuery(
-            'SELECT toaddress, folder, count(msgid) as cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder')
+        queryreturn = sqlQuery('SELECT toaddress, folder, count(msgid) as cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder')
         for row in queryreturn:
             toaddress, folder, cnt = row
             total += cnt
@@ -566,10 +518,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             db[None]["sent"] = 0
             db[None]["trash"] = 0
             enabled[None] = True
-
+        
         if treeWidget.isSortingEnabled():
             treeWidget.setSortingEnabled(False)
-
+        
+        widgets = {}
         i = 0
         while i < treeWidget.topLevelItemCount():
             widget = treeWidget.topLevelItem(i)
@@ -577,8 +530,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 toAddress = widget.address
             else:
                 toAddress = None
-
-            if toAddress not in db:
+            
+            if not toAddress in db:
                 treeWidget.takeTopLevelItem(i)
                 # no increment
                 continue
@@ -598,7 +551,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 j += 1
 
             # add missing folders
-            if db[toAddress]:
+            if len(db[toAddress]) > 0:
                 j = 0
                 for f, c in db[toAddress].iteritems():
                     if toAddress is not None and tab == 'messages' and folder == "new":
@@ -610,7 +563,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             widget.setUnreadCount(unread)
             db.pop(toAddress, None)
             i += 1
-
+        
         i = 0
         for toAddress in db:
             widget = Ui_AddressWidget(treeWidget, i, toAddress, db[toAddress]["inbox"], enabled[toAddress])
@@ -625,12 +578,10 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 j += 1
             widget.setUnreadCount(unread)
             i += 1
-
+        
         treeWidget.setSortingEnabled(True)
 
     def __init__(self, parent=None):
-        """TBC"""
-
         QtGui.QWidget.__init__(self, parent)
         self.ui = Ui_MainWindow()
         self.ui.setupUi(self)
@@ -638,14 +589,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         # Ask the user if we may delete their old version 1 addresses if they
         # have any.
         for addressInKeysFile in getSortedAccounts():
-            status, addressVersionNumber, streamNumber, addressHash = decodeAddress(
+            status, addressVersionNumber, streamNumber, hash = decodeAddress(
                 addressInKeysFile)
             if addressVersionNumber == 1:
                 displayMsg = _translate(
-                    "MainWindow",
-                    'One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer '
-                    'supported. May we delete it now?'
-                ).arg(addressInKeysFile)
+                    "MainWindow", "One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. "
+                    + "May we delete it now?").arg(addressInKeysFile)
                 reply = QtGui.QMessageBox.question(
                     self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
                 if reply == QtGui.QMessageBox.Yes:
@@ -655,13 +604,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         # Configure Bitmessage to start on startup (or remove the
         # configuration) based on the setting in the keys.dat file
         if 'win32' in sys.platform or 'win64' in sys.platform:
-
             # Auto-startup for Windows
             RUN_PATH = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run"
             self.settings = QtCore.QSettings(RUN_PATH, QtCore.QSettings.NativeFormat)
-            # In case the user moves the program and the registry entry is no longer
-            # valid, this will delete the old registry entry.
-            self.settings.remove("PyBitmessage")
+            self.settings.remove(
+                "PyBitmessage")  # In case the user moves the program and the registry entry is no longer valid, this will delete the old registry entry.
             if BMConfigParser().getboolean('bitmessagesettings', 'startonlogon'):
                 self.settings.setValue("PyBitmessage", sys.argv[0])
         elif 'darwin' in sys.platform:
@@ -673,13 +620,13 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
         # e.g. for editing labels
         self.recurDepth = 0
-
+        
         # switch back to this when replying
         self.replyFromTab = None
 
         # so that quit won't loop
         self.quitAccepted = False
-
+        
         self.init_file_menu()
         self.init_inbox_popup_menu()
         self.init_identities_popup_menu()
@@ -775,13 +722,13 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.unreadCount = 0
 
         # Set the icon sizes for the identicons
-        identicon_size = 3 * 7
+        identicon_size = 3*7
         self.ui.tableWidgetInbox.setIconSize(QtCore.QSize(identicon_size, identicon_size))
         self.ui.treeWidgetChans.setIconSize(QtCore.QSize(identicon_size, identicon_size))
         self.ui.treeWidgetYourIdentities.setIconSize(QtCore.QSize(identicon_size, identicon_size))
         self.ui.treeWidgetSubscriptions.setIconSize(QtCore.QSize(identicon_size, identicon_size))
         self.ui.tableWidgetAddressBook.setIconSize(QtCore.QSize(identicon_size, identicon_size))
-
+        
         self.UISignalThread = UISignaler.get()
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
             "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable)
@@ -791,15 +738,10 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             "updateSentItemStatusByToAddress(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByToAddress)
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
             "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByAckdata)
-        QtCore.QObject.connect(
-            self.UISignalThread, QtCore.SIGNAL(
-                "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
-            self.displayNewInboxMessage)
-        QtCore.QObject.connect(
-            self.UISignalThread, QtCore.SIGNAL(
-                ("displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,"
-                 "PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)")),
-            self.displayNewSentMessage)
+        QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
+            "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewInboxMessage)
+        QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
+            "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewSentMessage)
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
             "setStatusIcon(PyQt_PyObject)"), self.setStatusIcon)
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
@@ -840,16 +782,16 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
         self.rerenderComboBoxSendFrom()
         self.rerenderComboBoxSendFromBroadcast()
-
+        
         # Put the TTL slider in the correct spot
         TTL = BMConfigParser().getint('bitmessagesettings', 'ttl')
-        if TTL < 3600:  # an hour
+        if TTL < 3600: # an hour
             TTL = 3600
-        elif TTL > 28 * 24 * 60 * 60:  # 28 days
-            TTL = 28 * 24 * 60 * 60
-        self.ui.horizontalSliderTTL.setSliderPosition((TTL - 3600) ** (1 / 3.199))
+        elif TTL > 28*24*60*60: # 28 days
+            TTL = 28*24*60*60
+        self.ui.horizontalSliderTTL.setSliderPosition((TTL - 3600) ** (1/3.199))
         self.updateHumanFriendlyTTLDescription(TTL)
-
+        
         QtCore.QObject.connect(self.ui.horizontalSliderTTL, QtCore.SIGNAL(
             "valueChanged(int)"), self.updateTTL)
 
@@ -861,24 +803,20 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         # Hide the 'Fetch Namecoin ID' button if we can't.
         if BMConfigParser().safeGetBoolean(
                 'bitmessagesettings', 'dontconnect'
-        ) or self.namecoin.test()[0] == 'failed':
+                ) or self.namecoin.test()[0] == 'failed':
             logger.warning(
                 'There was a problem testing for a Namecoin daemon. Hiding the'
                 ' Fetch Namecoin ID button')
             self.ui.pushButtonFetchNamecoinID.hide()
 
     def updateTTL(self, sliderPosition):
-        """TBC"""
-
         TTL = int(sliderPosition ** 3.199 + 3600)
         self.updateHumanFriendlyTTLDescription(TTL)
         BMConfigParser().set('bitmessagesettings', 'ttl', str(TTL))
         BMConfigParser().save()
-
+        
     def updateHumanFriendlyTTLDescription(self, TTL):
-        """TBC"""
-
-        numberOfHours = int(round(TTL / (60 * 60)))
+        numberOfHours = int(round(TTL / (60*60)))
         font = QtGui.QFont()
         stylesheet = ""
 
@@ -887,28 +825,19 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 _translate("MainWindow", "%n hour(s)", None, QtCore.QCoreApplication.CodecForTr, numberOfHours) +
                 ", " +
                 _translate("MainWindow", "not recommended for chans", None, QtCore.QCoreApplication.CodecForTr)
-            )
+                )
             stylesheet = "QLabel { color : red; }"
             font.setBold(True)
         else:
-            numberOfDays = int(round(TTL / (24 * 60 * 60)))
-            self.ui.labelHumanFriendlyTTLDescription.setText(
-                _translate(
-                    "MainWindow",
-                    "%n day(s)",
-                    None,
-                    QtCore.QCoreApplication.CodecForTr,
-                    numberOfDays))
+            numberOfDays = int(round(TTL / (24*60*60)))
+            self.ui.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "%n day(s)", None, QtCore.QCoreApplication.CodecForTr, numberOfDays))
             font.setBold(False)
         self.ui.labelHumanFriendlyTTLDescription.setStyleSheet(stylesheet)
         self.ui.labelHumanFriendlyTTLDescription.setFont(font)
 
+    # Show or hide the application window after clicking an item within the
+    # tray icon or, on Windows, the try icon itself.
     def appIndicatorShowOrHideWindow(self):
-        """
-        Show or hide the application window after clicking an item within the tray icon or, on Windows,
-        the try icon itself.
-        """
-
         if not self.actionShow.isChecked():
             self.hide()
         else:
@@ -918,18 +847,16 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.raise_()
             self.activateWindow()
 
+    # show the application window
     def appIndicatorShow(self):
-        """show the application window"""
-
         if self.actionShow is None:
             return
         if not self.actionShow.isChecked():
             self.actionShow.setChecked(True)
         self.appIndicatorShowOrHideWindow()
 
+    # unchecks the show item on the application indicator
     def appIndicatorHide(self):
-        """unchecks the show item on the application indicator"""
-
         if self.actionShow is None:
             return
         if self.actionShow.isChecked():
@@ -937,16 +864,25 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.appIndicatorShowOrHideWindow()
 
     def appIndicatorSwitchQuietMode(self):
-        """TBC"""
-
         BMConfigParser().set(
             'bitmessagesettings', 'showtraynotifications',
             str(not self.actionQuiet.isChecked())
         )
 
-    def appIndicatorInbox(self, item=None):
-        """Show the program window and select inbox tab"""
+    # application indicator show or hide
+    """# application indicator show or hide
+    def appIndicatorShowBitmessage(self):
+        #if self.actionShow == None:
+        #    return
+        print self.actionShow.isChecked()
+        if not self.actionShow.isChecked():
+            self.hide()
+            #self.setWindowState(self.windowState() & QtCore.Qt.WindowMinimized)
+        else:
+            self.appIndicatorShowOrHideWindow()"""
 
+    # Show the program window and select inbox tab
+    def appIndicatorInbox(self, item=None):
         self.appIndicatorShow()
         # select inbox
         self.ui.tabWidget.setCurrentIndex(
@@ -962,24 +898,22 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         else:
             self.ui.tableWidgetInbox.setCurrentCell(0, 0)
 
+    # Show the program window and select send tab
     def appIndicatorSend(self):
-        """Show the program window and select send tab"""
         self.appIndicatorShow()
         self.ui.tabWidget.setCurrentIndex(
             self.ui.tabWidget.indexOf(self.ui.send)
         )
 
+    # Show the program window and select subscriptions tab
     def appIndicatorSubscribe(self):
-        """Show the program window and select subscriptions tab"""
-
         self.appIndicatorShow()
         self.ui.tabWidget.setCurrentIndex(
             self.ui.tabWidget.indexOf(self.ui.subscriptions)
         )
 
+    # Show the program window and select channels tab
     def appIndicatorChannel(self):
-        """Show the program window and select channels tab"""
-
         self.appIndicatorShow()
         self.ui.tabWidget.setCurrentIndex(
             self.ui.tabWidget.indexOf(self.ui.chans)
@@ -1025,12 +959,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 for col in (0, 1, 2):
                     related.item(rrow, col).setUnread(not status)
 
-    def propagateUnreadCount(self, address=None, folder="inbox", widget=None, type_arg=1):
-        """TBC"""
-
+    def propagateUnreadCount(self, address = None, folder = "inbox", widget = None, type = 1):
         widgets = [self.ui.treeWidgetYourIdentities, self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans]
-        queryReturn = sqlQuery(
-            "SELECT toaddress, folder, COUNT(msgid) AS cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder")
+        queryReturn = sqlQuery("SELECT toaddress, folder, COUNT(msgid) AS cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder")
         totalUnread = {}
         normalUnread = {}
         for row in queryReturn:
@@ -1042,15 +973,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 totalUnread[row[1]] += row[2]
             else:
                 totalUnread[row[1]] = row[2]
-        queryReturn = sqlQuery(
-            "SELECT fromaddress, folder, COUNT(msgid) AS cnt FROM inbox "
-            "WHERE read = 0 AND toaddress = ? GROUP BY fromaddress, folder",
-            str_broadcast_subscribers)
+        queryReturn = sqlQuery("SELECT fromaddress, folder, COUNT(msgid) AS cnt FROM inbox WHERE read = 0 AND toaddress = ? GROUP BY fromaddress, folder", str_broadcast_subscribers)
         broadcastsUnread = {}
         for row in queryReturn:
             broadcastsUnread[row[0]] = {}
             broadcastsUnread[row[0]][row[1]] = row[2]
-
+        
         for treeWidget in widgets:
             root = treeWidget.invisibleRootItem()
             for i in range(root.childCount()):
@@ -1077,8 +1005,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     if addressItem.type == AccountMixin.ALL and folderName in totalUnread:
                         newCount = totalUnread[folderName]
                     elif addressItem.type == AccountMixin.SUBSCRIPTION:
-                        if addressItem.address in broadcastsUnread and folderName in broadcastsUnread[
-                                addressItem.address]:
+                        if addressItem.address in broadcastsUnread and folderName in broadcastsUnread[addressItem.address]:
                             newCount = broadcastsUnread[addressItem.address][folderName]
                     elif addressItem.address in normalUnread and folderName in normalUnread[addressItem.address]:
                         newCount = normalUnread[addressItem.address][folderName]
@@ -1086,20 +1013,16 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                         folderItem.setUnreadCount(newCount)
 
     def addMessageListItem(self, tableWidget, items):
-        """TBC"""
-
         sortingEnabled = tableWidget.isSortingEnabled()
         if sortingEnabled:
             tableWidget.setSortingEnabled(False)
         tableWidget.insertRow(0)
-        for i, _ in enumerate(items):
+        for i in range(len(items)):
             tableWidget.setItem(0, i, items[i])
         if sortingEnabled:
             tableWidget.setSortingEnabled(True)
 
     def addMessageListItemSent(self, tableWidget, toAddress, fromAddress, subject, status, ackdata, lastactiontime):
-        """TBC"""
-
         acct = accountClass(fromAddress)
         if acct is None:
             acct = BMAccount(fromAddress)
@@ -1138,19 +1061,14 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             statusText = _translate(
                 "MainWindow", "Doing work necessary to send broadcast.")
         elif status == 'broadcastsent':
-            statusText = _translate(
-                "MainWindow", "Broadcast on %1").arg(
-                    l10n.formatTimestamp(lastactiontime))
+            statusText = _translate("MainWindow", "Broadcast on %1").arg(
+                l10n.formatTimestamp(lastactiontime))
         elif status == 'toodifficult':
-            statusText = _translate(
-                "MainWindow",
-                "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg(
-                    l10n.formatTimestamp(lastactiontime))
+            statusText = _translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg(
+                l10n.formatTimestamp(lastactiontime))
         elif status == 'badkey':
-            statusText = _translate(
-                "MainWindow",
-                "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg(
-                    l10n.formatTimestamp(lastactiontime))
+            statusText = _translate("MainWindow", "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg(
+                l10n.formatTimestamp(lastactiontime))
         elif status == 'forcepow':
             statusText = _translate(
                 "MainWindow", "Forced difficulty override. Send should start soon.")
@@ -1168,8 +1086,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         return acct
 
     def addMessageListItemInbox(self, tableWidget, msgfolder, msgid, toAddress, fromAddress, subject, received, read):
-        """TBC"""
-
         font = QtGui.QFont()
         font.setBold(True)
         if toAddress == str_broadcast_subscribers:
@@ -1181,9 +1097,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         if acct is None:
             acct = BMAccount(fromAddress)
         acct.parseMessage(toAddress, fromAddress, subject, "")
-
+            
         items = []
-        # to
+        #to
         MessageList_AddressWidget(items, toAddress, unicode(acct.toLabel, 'utf-8'), not read)
         # from
         MessageList_AddressWidget(items, fromAddress, unicode(acct.fromLabel, 'utf-8'), not read)
@@ -1202,9 +1118,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.addMessageListItem(tableWidget, items)
         return acct
 
+    # Load Sent items from database
     def loadSent(self, tableWidget, account, where="", what=""):
-        """Load Sent items from database"""
-
         if tableWidget == self.ui.tableWidgetInboxSubscriptions:
             tableWidget.setColumnHidden(0, True)
             tableWidget.setColumnHidden(1, False)
@@ -1236,9 +1151,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         tableWidget.horizontalHeaderItem(3).setText(_translate("MainWindow", "Sent", None))
         tableWidget.setUpdatesEnabled(True)
 
-    def loadMessagelist(self, tableWidget, account, folder="inbox", where="", what="", unreadOnly=False):
-        """Load messages from database file"""
-
+    # Load messages from database file
+    def loadMessagelist(self, tableWidget, account, folder="inbox", where="", what="", unreadOnly = False):
         if folder == 'sent':
             self.loadSent(tableWidget, account, where, what)
             return
@@ -1259,11 +1173,10 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         tableWidget.setRowCount(0)
 
         queryreturn = helper_search.search_sql(xAddress, account, folder, where, what, unreadOnly)
-
+        
         for row in queryreturn:
             msgfolder, msgid, toAddress, fromAddress, subject, received, read = row
-            self.addMessageListItemInbox(tableWidget, msgfolder, msgid, toAddress,
-                                         fromAddress, subject, received, read)
+            self.addMessageListItemInbox(tableWidget, msgfolder, msgid, toAddress, fromAddress, subject, received, read)
 
         tableWidget.horizontalHeader().setSortIndicator(
             3, QtCore.Qt.DescendingOrder)
@@ -1272,10 +1185,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         tableWidget.horizontalHeaderItem(3).setText(_translate("MainWindow", "Received", None))
         tableWidget.setUpdatesEnabled(True)
 
-    def appIndicatorInit(self, this_app):
-        """create application indicator"""
-
-        self.initTrayIcon("can-icon-24px-red.png", this_app)
+    # create application indicator
+    def appIndicatorInit(self, app):
+        self.initTrayIcon("can-icon-24px-red.png", app)
         traySignal = "activated(QSystemTrayIcon::ActivationReason)"
         QtCore.QObject.connect(self.tray, QtCore.SIGNAL(
             traySignal), self.__icon_activated)
@@ -1297,7 +1209,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.actionShow.setChecked(not BMConfigParser().getboolean(
             'bitmessagesettings', 'startintray'))
         self.actionShow.triggered.connect(self.appIndicatorShowOrHideWindow)
-        if sys.platform[0:3] != 'win':
+        if not sys.platform[0:3] == 'win':
             m.addAction(self.actionShow)
 
         # quiet mode
@@ -1338,9 +1250,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.tray.setContextMenu(m)
         self.tray.show()
 
+    # returns the number of unread messages and subscriptions
     def getUnread(self):
-        """returns the number of unread messages and subscriptions"""
-
         counters = [0, 0]
 
         queryreturn = sqlQuery('''
@@ -1355,15 +1266,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
         return counters
 
-    def playSound(self, category, label):  # pylint: disable=inconsistent-return-statements
-        """play a sound"""
-
+    # play a sound
+    def playSound(self, category, label):
         # filename of the sound to be played
         soundFilename = None
 
-        def _choose_ext(basename):  # pylint: disable=inconsistent-return-statements
-            """TBC"""
-
+        def _choose_ext(basename):
             for ext in sound.extensions:
                 if os.path.isfile(os.extsep.join([basename, ext])):
                     return os.extsep + ext
@@ -1426,14 +1334,13 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
         self._player(soundFilename)
 
+    # Adapters and converters for QT <-> sqlite
     def sqlInit(self):
-        """Adapters and converters for QT <-> sqlite"""
-
         register_adapter(QtCore.QByteArray, str)
 
+    # Try init the distro specific appindicator,
+    # for example the Ubuntu MessagingMenu
     def indicatorInit(self):
-        """ Try init the distro specific appindicator, for example the Ubuntu MessagingMenu"""
-
         def _noop_update(*args, **kwargs):
             pass
 
@@ -1443,9 +1350,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             logger.warning("No indicator plugin found")
             self.indicatorUpdate = _noop_update
 
+    # initialise the message notifier
     def notifierInit(self):
-        """initialise the message notifier"""
-
         def _simple_notify(
                 title, subtitle, category, label=None, icon=None):
             self.tray.showMessage(title, subtitle, 1, 2000)
@@ -1475,34 +1381,27 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
     def notifierShow(
             self, title, subtitle, category, label=None, icon=None):
-        """TBC"""
-
         self.playSound(category, label)
         self._notifier(
             unicode(title), unicode(subtitle), category, label, icon)
 
+    # tree
     def treeWidgetKeyPressEvent(self, event):
-        """tree"""
-
         return self.handleKeyPress(event, self.getCurrentTreeWidget())
 
+    # inbox / sent
     def tableWidgetKeyPressEvent(self, event):
-        """inbox / sent"""
-
         return self.handleKeyPress(event, self.getCurrentMessagelist())
 
+    # messageview
     def textEditKeyPressEvent(self, event):
-        """messageview"""
-
         return self.handleKeyPress(event, self.getCurrentMessageTextedit())
 
-    def handleKeyPress(self, event, focus=None):  # pylint: disable=inconsistent-return-statements
-        """TBC"""
-
+    def handleKeyPress(self, event, focus = None):
         messagelist = self.getCurrentMessagelist()
         folder = self.getCurrentFolder()
         if event.key() == QtCore.Qt.Key_Delete:
-            if isinstance(focus, (MessageView, QtGui.QTableWidget)):
+            if isinstance (focus, MessageView) or isinstance(focus, QtGui.QTableWidget):
                 if folder == "sent":
                     self.on_action_SentTrash()
                 else:
@@ -1538,116 +1437,60 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 self.ui.lineEditTo.setFocus()
                 event.ignore()
             elif event.key() == QtCore.Qt.Key_F:
-                searchline = self.getCurrentSearchLine(retObj=True)
+                searchline = self.getCurrentSearchLine(retObj = True)
                 if searchline:
                     searchline.setFocus()
                 event.ignore()
         if not event.isAccepted():
             return
-        if isinstance(focus, MessageView):
+        if isinstance (focus, MessageView):
             return MessageView.keyPressEvent(focus, event)
-        elif isinstance(focus, QtGui.QTableWidget):
+        elif isinstance (focus, QtGui.QTableWidget):
             return QtGui.QTableWidget.keyPressEvent(focus, event)
-        elif isinstance(focus, QtGui.QTreeWidget):
+        elif isinstance (focus, QtGui.QTreeWidget):
             return QtGui.QTreeWidget.keyPressEvent(focus, event)
 
+    # menu button 'manage keys'
     def click_actionManageKeys(self):
-        """menu button 'manage keys'"""
-
         if 'darwin' in sys.platform or 'linux' in sys.platform:
             if state.appdata == '':
                 # reply = QtGui.QMessageBox.information(self, 'keys.dat?','You
                 # may manage your keys by editing the keys.dat file stored in
                 # the same directory as this program. It is important that you
                 # back up this file.', QMessageBox.Ok)
-                reply = QtGui.QMessageBox.information(
-                    self,
-                    'keys.dat?',
-                    _translate(
-                        "MainWindow",
-                        ("You may manage your keys by editing the keys.dat file stored in the same directory as this "
-                         "program. It is important that you back up this file.")),
-                    QtGui.QMessageBox.Ok)
+                reply = QtGui.QMessageBox.information(self, 'keys.dat?', _translate(
+                    "MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file."), QtGui.QMessageBox.Ok)
 
             else:
-                QtGui.QMessageBox.information(
-                    self,
-                    'keys.dat?',
-                    _translate(
-                        "MainWindow",
-                        ("You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important "
-                         "that you back up this file.")).arg(
-                             state.appdata),
-                    QtGui.QMessageBox.Ok)
+                QtGui.QMessageBox.information(self, 'keys.dat?', _translate(
+                    "MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file.").arg(state.appdata), QtGui.QMessageBox.Ok)
         elif sys.platform == 'win32' or sys.platform == 'win64':
             if state.appdata == '':
-                reply = QtGui.QMessageBox.question(
-                    self,
-                    _translate(
-                        "MainWindow",
-                        "Open keys.dat?"),
-                    _translate(
-                        "MainWindow",
-                        ("You may manage your keys by editing the keys.dat file stored in the same directory as this "
-                         "program. It is important that you back up this file. Would you like to open the file now? "
-                         "(Be sure to close Bitmessage before making any changes.)")),
-                    QtGui.QMessageBox.Yes,
-                    QtGui.QMessageBox.No)
+                reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Open keys.dat?"), _translate(
+                    "MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
             else:
-                reply = QtGui.QMessageBox.question(
-                    self,
-                    _translate(
-                        "MainWindow",
-                        "Open keys.dat?"),
-                    _translate(
-                        "MainWindow",
-                        ("You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important "
-                         "that you back up this file. Would you like to open the file now? (Be sure to close "
-                         "Bitmessage before making any changes.)")).arg(
-                             state.appdata),
-                    QtGui.QMessageBox.Yes,
-                    QtGui.QMessageBox.No)
+                reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Open keys.dat?"), _translate(
+                    "MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)").arg(state.appdata), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
             if reply == QtGui.QMessageBox.Yes:
                 shared.openKeysFile()
 
+    # menu button 'delete all treshed messages'
     def click_actionDeleteAllTrashedMessages(self):
-        """menu button 'delete all treshed messages'"""
-
-        if QtGui.QMessageBox.question(
-                self,
-                _translate(
-                    "MainWindow",
-                    "Delete trash?"),
-                _translate(
-                    "MainWindow",
-                    "Are you sure you want to delete all trashed messages?"),
-                QtGui.QMessageBox.Yes,
-                QtGui.QMessageBox.No) == QtGui.QMessageBox.No:
+        if QtGui.QMessageBox.question(self, _translate("MainWindow", "Delete trash?"), _translate("MainWindow", "Are you sure you want to delete all trashed messages?"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) == QtGui.QMessageBox.No:
             return
         sqlStoredProcedure('deleteandvacuume')
         self.rerenderTabTreeMessages()
         self.rerenderTabTreeSubscriptions()
         self.rerenderTabTreeChans()
         if self.getCurrentFolder(self.ui.treeWidgetYourIdentities) == "trash":
-            self.loadMessagelist(
-                self.ui.tableWidgetInbox, self.getCurrentAccount(
-                    self.ui.treeWidgetYourIdentities), "trash")
+            self.loadMessagelist(self.ui.tableWidgetInbox, self.getCurrentAccount(self.ui.treeWidgetYourIdentities), "trash")
         elif self.getCurrentFolder(self.ui.treeWidgetSubscriptions) == "trash":
-            self.loadMessagelist(
-                self.ui.tableWidgetInboxSubscriptions,
-                self.getCurrentAccount(
-                    self.ui.treeWidgetSubscriptions),
-                "trash")
+            self.loadMessagelist(self.ui.tableWidgetInboxSubscriptions, self.getCurrentAccount(self.ui.treeWidgetSubscriptions), "trash")
         elif self.getCurrentFolder(self.ui.treeWidgetChans) == "trash":
-            self.loadMessagelist(
-                self.ui.tableWidgetInboxChans,
-                self.getCurrentAccount(
-                    self.ui.treeWidgetChans),
-                "trash")
+            self.loadMessagelist(self.ui.tableWidgetInboxChans, self.getCurrentAccount(self.ui.treeWidgetChans), "trash")
 
+    # menu button 'regenerate deterministic addresses'
     def click_actionRegenerateDeterministicAddresses(self):
-        """menu button 'regenerate deterministic addresses'"""
-
         dialog = dialogs.RegenerateAddressesDialog(self)
         if dialog.exec_():
             if dialog.lineEditPassphrase.text() == "":
@@ -1694,14 +1537,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 self.ui.tabWidget.indexOf(self.ui.chans)
             )
 
+    # opens 'join chan' dialog
     def click_actionJoinChan(self):
-        """opens 'join chan' dialog"""
-
         dialogs.NewChanDialog(self)
 
     def showConnectDialog(self):
-        """TBC"""
-
         dialog = dialogs.ConnectDialog(self)
         if dialog.exec_():
             if dialog.radioButtonConnectNow.isChecked():
@@ -1714,8 +1554,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 self._firstrun = False
 
     def showMigrationWizard(self, level):
-        """TBC"""
-
         self.migrationWizardInstance = Ui_MigrationWizard(["a"])
         if self.migrationWizardInstance.exec_():
             pass
@@ -1723,8 +1561,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             pass
 
     def changeEvent(self, event):
-        """TBC"""
-
         if event.type() == QtCore.QEvent.LanguageChange:
             self.ui.retranslateUi(self)
             self.init_inbox_popup_menu(False)
@@ -1736,17 +1572,15 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.ui.blackwhitelist.init_blacklist_popup_menu(False)
         if event.type() == QtCore.QEvent.WindowStateChange:
             if self.windowState() & QtCore.Qt.WindowMinimized:
-                if BMConfigParser().getboolean('bitmessagesettings', 'minimizetotray'):
-                    if 'darwin' not in sys.platform:
-                        QtCore.QTimer.singleShot(0, self.appIndicatorHide)
+                if BMConfigParser().getboolean('bitmessagesettings', 'minimizetotray') and not 'darwin' in sys.platform:
+                    QtCore.QTimer.singleShot(0, self.appIndicatorHide)
             elif event.oldState() & QtCore.Qt.WindowMinimized:
                 # The window state has just been changed to
                 # Normal/Maximised/FullScreen
                 pass
+        # QtGui.QWidget.changeEvent(self, event)
 
     def __icon_activated(self, reason):
-        """TBC"""
-
         if reason == QtGui.QSystemTrayIcon.Trigger:
             self.actionShow.setChecked(not self.actionShow.isChecked())
             self.appIndicatorShowOrHideWindow()
@@ -1755,8 +1589,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
     connected = False
 
     def setStatusIcon(self, color):
-        """Set the status icon"""
-
+        # print 'setting status icon color'
         _notifications_enabled = not BMConfigParser().getboolean(
             'bitmessagesettings', 'hidetrayconnectionnotifications')
         if color == 'red':
@@ -1770,7 +1603,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     _translate("MainWindow", "Connection lost"),
                     sound.SOUND_DISCONNECTED)
             if not BMConfigParser().safeGetBoolean('bitmessagesettings', 'upnp') and \
-                    BMConfigParser().get('bitmessagesettings', 'socksproxytype') == "none":
+                BMConfigParser().get('bitmessagesettings', 'socksproxytype') == "none":
                 self.updateStatusBar(
                     _translate(
                         "MainWindow",
@@ -1784,9 +1617,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     "MainWindow", "Not Connected"))
                 self.setTrayIconFile("can-icon-24px-red.png")
         if color == 'yellow':
-            if self.statusbar.currentMessage() == ('Warning: You are currently not connected. Bitmessage will do '
-                                                   'the work necessary to send the message but it won\'t send until '
-                                                   'you connect.'):
+            if self.statusbar.currentMessage() == 'Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.':
                 self.statusbar.clearMessage()
             self.pushButtonStatusIcon.setIcon(
                 QtGui.QIcon(":/newPrefix/images/yellowicon.png"))
@@ -1804,9 +1635,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     "MainWindow", "Connected"))
                 self.setTrayIconFile("can-icon-24px-yellow.png")
         if color == 'green':
-            if self.statusbar.currentMessage() == ('Warning: You are currently not connected. Bitmessage will do the '
-                                                   'work necessary to send the message but it won\'t send until you '
-                                                   'connect.'):
+            if self.statusbar.currentMessage() == 'Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.':
                 self.statusbar.clearMessage()
             self.pushButtonStatusIcon.setIcon(
                 QtGui.QIcon(":/newPrefix/images/greenicon.png"))
@@ -1823,23 +1652,17 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     "MainWindow", "Connected"))
                 self.setTrayIconFile("can-icon-24px-green.png")
 
-    def initTrayIcon(self, iconFileName, this_app):
-        """TBC"""
-
+    def initTrayIcon(self, iconFileName, app):
         self.currentTrayIconFileName = iconFileName
         self.tray = QtGui.QSystemTrayIcon(
-            self.calcTrayIcon(iconFileName, self.findInboxUnreadCount()), this_app)
+            self.calcTrayIcon(iconFileName, self.findInboxUnreadCount()), app)
 
     def setTrayIconFile(self, iconFileName):
-        """TBC"""
-
         self.currentTrayIconFileName = iconFileName
         self.drawTrayIcon(iconFileName, self.findInboxUnreadCount())
 
     def calcTrayIcon(self, iconFileName, inboxUnreadCount):
-        """TBC"""
-
-        pixmap = QtGui.QPixmap(":/newPrefix/images/" + iconFileName)
+        pixmap = QtGui.QPixmap(":/newPrefix/images/"+iconFileName)
         if inboxUnreadCount > 0:
             # choose font and calculate font parameters
             fontName = "Lucida"
@@ -1851,7 +1674,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             rect = fontMetrics.boundingRect(txt)
             # margins that we add in the top-right corner
             marginX = 2
-            marginY = 0  # it looks like -2 is also ok due to the error of metric
+            marginY = 0 # it looks like -2 is also ok due to the error of metric
             # if it renders too wide we need to change it to a plus symbol
             if rect.width() > 20:
                 txt = "+"
@@ -1865,18 +1688,14 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             painter.setPen(
                 QtGui.QPen(QtGui.QColor(255, 0, 0), QtCore.Qt.SolidPattern))
             painter.setFont(font)
-            painter.drawText(24 - rect.right() - marginX, -rect.top() + marginY, txt)
+            painter.drawText(24-rect.right()-marginX, -rect.top()+marginY, txt)
             painter.end()
         return QtGui.QIcon(pixmap)
 
     def drawTrayIcon(self, iconFileName, inboxUnreadCount):
-        """TBC"""
-
         self.tray.setIcon(self.calcTrayIcon(iconFileName, inboxUnreadCount))
 
     def changedInboxUnread(self, row=None):
-        """TBC"""
-
         self.drawTrayIcon(
             self.currentTrayIconFileName, self.findInboxUnreadCount())
         self.rerenderTabTreeMessages()
@@ -1884,8 +1703,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.rerenderTabTreeChans()
 
     def findInboxUnreadCount(self, count=None):
-        """TBC"""
-
         if count is None:
             queryreturn = sqlQuery('''SELECT count(*) from inbox WHERE folder='inbox' and read=0''')
             cnt = 0
@@ -1897,14 +1714,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         return self.unreadCount
 
     def updateSentItemStatusByToAddress(self, toAddress, textToDisplay):
-        """TBC"""
-
         for sent in [self.ui.tableWidgetInbox, self.ui.tableWidgetInboxSubscriptions, self.ui.tableWidgetInboxChans]:
             treeWidget = self.widgetConvert(sent)
             if self.getCurrentFolder(treeWidget) != "sent":
                 continue
-            if treeWidget in [self.ui.treeWidgetSubscriptions,
-                              self.ui.treeWidgetChans] and self.getCurrentAccount(treeWidget) != toAddress:
+            if treeWidget in [self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans] and self.getCurrentAccount(treeWidget) != toAddress:
                 continue
 
             for i in range(sent.rowCount()):
@@ -1913,7 +1727,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     sent.item(i, 3).setToolTip(textToDisplay)
                     try:
                         newlinePosition = textToDisplay.indexOf('\n')
-                    except:  # If no "_translate" appended to string before passing in, there's no qstring
+                    except: # If someone misses adding a "_translate" to a string before passing it to this function, this function won't receive a qstring which will cause an exception.
                         newlinePosition = 0
                     if newlinePosition > 1:
                         sent.item(i, 3).setText(
@@ -1922,9 +1736,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                         sent.item(i, 3).setText(textToDisplay)
 
     def updateSentItemStatusByAckdata(self, ackdata, textToDisplay):
-        """TBC"""
-
-        if isinstance(ackdata, str):
+        if type(ackdata) is str:
             ackdata = QtCore.QByteArray(ackdata)
         for sent in [self.ui.tableWidgetInbox, self.ui.tableWidgetInboxSubscriptions, self.ui.tableWidgetInboxChans]:
             treeWidget = self.widgetConvert(sent)
@@ -1941,7 +1753,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     sent.item(i, 3).setToolTip(textToDisplay)
                     try:
                         newlinePosition = textToDisplay.indexOf('\n')
-                    except:  # If no "_translate" appended to string before passing in, there's no qstring
+                    except: # If someone misses adding a "_translate" to a string before passing it to this function, this function won't receive a qstring which will cause an exception.
                         newlinePosition = 0
                     if newlinePosition > 1:
                         sent.item(i, 3).setText(
@@ -1950,80 +1762,50 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                         sent.item(i, 3).setText(textToDisplay)
 
     def removeInboxRowByMsgid(self, msgid):  # msgid and inventoryHash are the same thing
-        """TBC"""
-
         for inbox in ([
-                self.ui.tableWidgetInbox,
-                self.ui.tableWidgetInboxSubscriptions,
-                self.ui.tableWidgetInboxChans]):
+            self.ui.tableWidgetInbox,
+            self.ui.tableWidgetInboxSubscriptions,
+            self.ui.tableWidgetInboxChans]):
             for i in range(inbox.rowCount()):
                 if msgid == str(inbox.item(i, 3).data(QtCore.Qt.UserRole).toPyObject()):
                     self.updateStatusBar(
                         _translate("MainWindow", "Message trashed"))
                     treeWidget = self.widgetConvert(inbox)
-                    self.propagateUnreadCount(
-                        inbox.item(
-                            i,
-                            1 if inbox.item(
-                                i,
-                                1).type == AccountMixin.SUBSCRIPTION else 0).data(
-                                    QtCore.Qt.UserRole),
-                        self.getCurrentFolder(treeWidget),
-                        treeWidget,
-                        0)
+                    self.propagateUnreadCount(inbox.item(i, 1 if inbox.item(i, 1).type == AccountMixin.SUBSCRIPTION else 0).data(QtCore.Qt.UserRole), self.getCurrentFolder(treeWidget), treeWidget, 0)
                     inbox.removeRow(i)
                     break
 
     def newVersionAvailable(self, version):
-        """TBC"""
-
         self.notifiedNewVersion = ".".join(str(n) for n in version)
-        self.updateStatusBar(
-            _translate(
-                "MainWindow",
-                "New version of PyBitmessage is available: %1. Download it"
-                " from https://github.com/Bitmessage/PyBitmessage/releases/latest"
+        self.updateStatusBar(_translate(
+            "MainWindow",
+            "New version of PyBitmessage is available: %1. Download it"
+            " from https://github.com/Bitmessage/PyBitmessage/releases/latest"
             ).arg(self.notifiedNewVersion)
         )
 
     def displayAlert(self, title, text, exitAfterUserClicksOk):
-        """TBC"""
-
         self.updateStatusBar(text)
         QtGui.QMessageBox.critical(self, title, text, QtGui.QMessageBox.Ok)
         if exitAfterUserClicksOk:
-            sys.exit(0)
+            os._exit(0)
 
     def rerenderMessagelistFromLabels(self):
-        """TBC"""
-
-        for messagelist in (
-                self.ui.tableWidgetInbox,
-                self.ui.tableWidgetInboxChans,
-                self.ui.tableWidgetInboxSubscriptions):
+        for messagelist in (self.ui.tableWidgetInbox, self.ui.tableWidgetInboxChans, self.ui.tableWidgetInboxSubscriptions):
             for i in range(messagelist.rowCount()):
                 messagelist.item(i, 1).setLabel()
 
     def rerenderMessagelistToLabels(self):
-        """TBC"""
-
-        for messagelist in (
-                self.ui.tableWidgetInbox,
-                self.ui.tableWidgetInboxChans,
-                self.ui.tableWidgetInboxSubscriptions):
+        for messagelist in (self.ui.tableWidgetInbox, self.ui.tableWidgetInboxChans, self.ui.tableWidgetInboxSubscriptions):
             for i in range(messagelist.rowCount()):
                 messagelist.item(i, 0).setLabel()
 
     def rerenderAddressBook(self):
-        """TBC"""
-
-        def addRow(address, label, arg_type):
-            """TBC"""
-
+        def addRow (address, label, type):
             self.ui.tableWidgetAddressBook.insertRow(0)
-            newItem = Ui_AddressBookWidgetItemLabel(address, unicode(label, 'utf-8'), arg_type)
+            newItem = Ui_AddressBookWidgetItemLabel(address, unicode(label, 'utf-8'), type)
             self.ui.tableWidgetAddressBook.setItem(0, 0, newItem)
-            newItem = Ui_AddressBookWidgetItemAddress(address, unicode(label, 'utf-8'), arg_type)
+            newItem = Ui_AddressBookWidgetItemAddress(address, unicode(label, 'utf-8'), type)
             self.ui.tableWidgetAddressBook.setItem(0, 1, newItem)
 
         oldRows = {}
@@ -2055,7 +1837,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             newRows[address] = [label, AccountMixin.NORMAL]
 
         completerList = []
-        for address in sorted(oldRows, key=lambda x: oldRows[x][2], reverse=True):
+        for address in sorted(oldRows, key = lambda x: oldRows[x][2], reverse = True):
             if address in newRows:
                 completerList.append(unicode(newRows[address][0], encoding="UTF-8") + " <" + address + ">")
                 newRows.pop(address)
@@ -2072,42 +1854,22 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.ui.lineEditTo.completer().model().setStringList(completerList)
 
     def rerenderSubscriptions(self):
-        """TBC"""
-
         self.rerenderTabTreeSubscriptions()
 
     def click_pushButtonTTL(self):
-        """TBC"""
-
         QtGui.QMessageBox.information(self, 'Time To Live', _translate(
-            "MainWindow",
-            ("The TTL, or Time-To-Live is the length of time that the network will hold the message."
-             "The recipient must get it during this time. If your Bitmessage client does not hear an "
-             "acknowledgement, it will resend the message automatically. The longer the Time-To-Live, "
-             "the more work your computer must do to send the message. A Time-To-Live of four or five "
-             "days is often appropriate.")), QtGui.QMessageBox.Ok)
+            "MainWindow", """The TTL, or Time-To-Live is the length of time that the network will hold the message.
+ The recipient must get it during this time. If your Bitmessage client does not hear an acknowledgement, it
+ will resend the message automatically. The longer the Time-To-Live, the
+ more work your computer must do to send the message. A Time-To-Live of four or five days is often appropriate."""), QtGui.QMessageBox.Ok)
 
     def click_pushButtonClear(self):
-        """TBC"""
-
         self.ui.lineEditSubject.setText("")
         self.ui.lineEditTo.setText("")
         self.ui.textEditMessage.setText("")
         self.ui.comboBoxSendFrom.setCurrentIndex(0)
 
     def click_pushButtonSend(self):
-        """
-        TBC
-
-        Regarding the line below `if len(message) > (2 ** 18 - 500):`:
-
-        The whole network message must fit in 2^18 bytes.
-        Let's assume 500 bytes of overhead. If someone wants to get that
-        too an exact number you are welcome to but I think that it would
-        be a better use of time to support message continuation so that
-        users can send messages of any length.
-        """
-
         encoding = 3 if QtGui.QApplication.queryKeyboardModifiers() & QtCore.Qt.ShiftModifier else 2
 
         self.statusbar.clearMessage()
@@ -2132,6 +1894,13 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             subject = str(self.ui.lineEditSubjectBroadcast.text().toUtf8())
             message = str(
                 self.ui.textEditMessageBroadcast.document().toPlainText().toUtf8())
+        """
+        The whole network message must fit in 2^18 bytes.
+        Let's assume 500 bytes of overhead. If someone wants to get that
+        too an exact number you are welcome to but I think that it would
+        be a better use of time to support message continuation so that
+        users can send messages of any length.
+        """
         if len(message) > (2 ** 18 - 500):
             QtGui.QMessageBox.about(
                 self, _translate("MainWindow", "Message too long"),
@@ -2145,13 +1914,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
         acct = accountClass(fromAddress)
 
-        if sendMessageToPeople:  # To send a message to specific people (rather than broadcast)
+        if sendMessageToPeople: # To send a message to specific people (rather than broadcast)
             toAddressesList = [s.strip()
                                for s in toAddresses.replace(',', ';').split(';')]
-            # remove duplicate addresses. If the user has one address with a BM- and
-            # the same address without the BM-, this will not catch it. They'll send
-            # the message to the person twice.
-            toAddressesList = list(set(toAddressesList))
+            toAddressesList = list(set(
+                toAddressesList))  # remove duplicate addresses. If the user has one address with a BM- and the same address without the BM-, this will not catch it. They'll send the message to the person twice.
             for toAddress in toAddressesList:
                 if toAddress != '':
                     # label plus address
@@ -2164,30 +1931,25 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                             subject = acct.subject
                             toAddress = acct.toAddress
                         else:
-                            if QtGui.QMessageBox.question(
-                                    self, "Sending an email?",
-                                    _translate(
-                                        "MainWindow",
-                                        ("You are trying to send an email instead of a bitmessage. This requires "
-                                         "registering with a gateway. Attempt to register?")),
-                                    QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) != QtGui.QMessageBox.Yes:
+                            if QtGui.QMessageBox.question(self, "Sending an email?", _translate("MainWindow", 
+                                "You are trying to send an email instead of a bitmessage. This requires registering with a gateway. Attempt to register?"),
+                                QtGui.QMessageBox.Yes|QtGui.QMessageBox.No) != QtGui.QMessageBox.Yes:
                                 continue
                             email = acct.getLabel()
-                            if email[-14:] != "@mailchuck.com":  # attempt register
+                            if email[-14:] != "@mailchuck.com": #attempt register
                                 # 12 character random email address
-                                email = ''.join(random.SystemRandom().choice(string.ascii_lowercase)
-                                                for _ in range(12)) + "@mailchuck.com"
+                                email = ''.join(random.SystemRandom().choice(string.ascii_lowercase) for _ in range(12)) + "@mailchuck.com"
                             acct = MailchuckAccount(fromAddress)
                             acct.register(email)
                             BMConfigParser().set(fromAddress, 'label', email)
                             BMConfigParser().set(fromAddress, 'gateway', 'mailchuck')
                             BMConfigParser().save()
-                            self.updateStatusBar(
-                                _translate(
-                                    "MainWindow",
-                                    ("Error: Your account wasn't registered at an email gateway. Sending registration"
-                                     " now as %1, please wait for the registration to be processed before retrying "
-                                     "sending.")
+                            self.updateStatusBar(_translate(
+                                "MainWindow",
+                                "Error: Your account wasn't registered at"
+                                " an email gateway. Sending registration"
+                                " now as %1, please wait for the registration"
+                                " to be processed before retrying sending."
                                 ).arg(email)
                             )
                             return
@@ -2205,19 +1967,19 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                                 "MainWindow",
                                 "Error: Bitmessage addresses start with"
                                 " BM-   Please check the recipient address %1"
-                            ).arg(toAddress))
+                                ).arg(toAddress))
                         elif status == 'checksumfailed':
                             self.updateStatusBar(_translate(
                                 "MainWindow",
                                 "Error: The recipient address %1 is not"
                                 " typed or copied correctly. Please check it."
-                            ).arg(toAddress))
+                                ).arg(toAddress))
                         elif status == 'invalidcharacters':
                             self.updateStatusBar(_translate(
                                 "MainWindow",
                                 "Error: The recipient address %1 contains"
                                 " invalid characters. Please check it."
-                            ).arg(toAddress))
+                                ).arg(toAddress))
                         elif status == 'versiontoohigh':
                             self.updateStatusBar(_translate(
                                 "MainWindow",
@@ -2225,7 +1987,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                                 " %1 is too high. Either you need to upgrade"
                                 " your Bitmessage software or your"
                                 " acquaintance is being clever."
-                            ).arg(toAddress))
+                                ).arg(toAddress))
                         elif status == 'ripetooshort':
                             self.updateStatusBar(_translate(
                                 "MainWindow",
@@ -2233,7 +1995,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                                 " address %1 is too short. There might be"
                                 " something wrong with the software of"
                                 " your acquaintance."
-                            ).arg(toAddress))
+                                ).arg(toAddress))
                         elif status == 'ripetoolong':
                             self.updateStatusBar(_translate(
                                 "MainWindow",
@@ -2241,7 +2003,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                                 " address %1 is too long. There might be"
                                 " something wrong with the software of"
                                 " your acquaintance."
-                            ).arg(toAddress))
+                                ).arg(toAddress))
                         elif status == 'varintmalformed':
                             self.updateStatusBar(_translate(
                                 "MainWindow",
@@ -2249,55 +2011,39 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                                 " address %1 is malformed. There might be"
                                 " something wrong with the software of"
                                 " your acquaintance."
-                            ).arg(toAddress))
+                                ).arg(toAddress))
                         else:
                             self.updateStatusBar(_translate(
                                 "MainWindow",
                                 "Error: Something is wrong with the"
                                 " recipient address %1."
-                            ).arg(toAddress))
+                                ).arg(toAddress))
                     elif fromAddress == '':
                         self.updateStatusBar(_translate(
                             "MainWindow",
-                            ("Error: You must specify a From address. If you don\'t have one, go to the"
-                             " \'Your Identities\' tab.")))
+                            "Error: You must specify a From address. If you"
+                            " don\'t have one, go to the"
+                            " \'Your Identities\' tab.")
+                        )
                     else:
                         toAddress = addBMIfNotPresent(toAddress)
 
                         if addressVersionNumber > 4 or addressVersionNumber <= 1:
-                            QtGui.QMessageBox.about(
-                                self,
-                                _translate(
-                                    "MainWindow",
-                                    "Address version number"),
-                                _translate(
-                                    "MainWindow",
-                                    ("Concerning the address %1, Bitmessage cannot understand address version "
-                                     "numbers of %2. Perhaps upgrade Bitmessage to the latest version.")
-                                ).arg(toAddress).arg(
-                                    str(addressVersionNumber)))
+                            QtGui.QMessageBox.about(self, _translate("MainWindow", "Address version number"), _translate(
+                                "MainWindow", "Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(addressVersionNumber)))
                             continue
                         if streamNumber > 1 or streamNumber == 0:
-                            QtGui.QMessageBox.about(
-                                self,
-                                _translate(
-                                    "MainWindow",
-                                    "Stream number"),
-                                _translate(
-                                    "MainWindow",
-                                    ("Concerning the address %1, Bitmessage cannot handle stream numbers of %2. "
-                                     "Perhaps upgrade Bitmessage to the latest version.")
-                                ).arg(toAddress).arg(
-                                    str(streamNumber)))
+                            QtGui.QMessageBox.about(self, _translate("MainWindow", "Stream number"), _translate(
+                                "MainWindow", "Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(streamNumber)))
                             continue
                         self.statusbar.clearMessage()
                         if shared.statusIconColor == 'red':
-                            self.updateStatusBar(
-                                _translate(
-                                    "MainWindow",
-                                    ("Warning: You are currently not connected. Bitmessage will do the work necessary"
-                                     " to send the message but it won\'t send until you connect.")
-                                )
+                            self.updateStatusBar(_translate(
+                                "MainWindow",
+                                "Warning: You are currently not connected."
+                                " Bitmessage will do the work necessary to"
+                                " send the message but it won\'t send until"
+                                " you connect.")
                             )
                         stealthLevel = BMConfigParser().safeGetInt(
                             'bitmessagesettings', 'ackstealthlevel')
@@ -2312,15 +2058,15 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                             subject,
                             message,
                             ackdata,
-                            int(time.time()),  # sentTime (this will never change)
-                            int(time.time()),  # lastActionTime
-                            0,  # sleepTill time. This will get set when the POW gets done.
+                            int(time.time()), # sentTime (this will never change)
+                            int(time.time()), # lastActionTime
+                            0, # sleepTill time. This will get set when the POW gets done.
                             'msgqueued',
-                            0,  # retryNumber
-                            'sent',  # folder
-                            encoding,  # encodingtype
+                            0, # retryNumber
+                            'sent', # folder
+                            encoding, # encodingtype
                             BMConfigParser().getint('bitmessagesettings', 'ttl')
-                        )
+                            )
 
                         toLabel = ''
                         queryreturn = sqlQuery('''select label from addressbook where address=?''',
@@ -2362,28 +2108,27 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 ackdata = genAckPayload(streamNumber, 0)
                 toAddress = str_broadcast_subscribers
                 ripe = ''
-                t = (
-                    '',  # msgid. We don't know what this will be until the POW is done.
-                    toAddress,
-                    ripe,
-                    fromAddress,
-                    subject,
-                    message,
-                    ackdata,
-                    int(time.time()),  # sentTime (this will never change)
-                    int(time.time()),  # lastActionTime
-                    0,  # sleepTill time. This will get set when the POW gets done.
-                    'broadcastqueued',
-                    0,  # retryNumber
-                    'sent',  # folder
-                    encoding,  # encoding type
-                    BMConfigParser().getint('bitmessagesettings', 'ttl')
-                )
+                t = ('', # msgid. We don't know what this will be until the POW is done. 
+                     toAddress, 
+                     ripe, 
+                     fromAddress, 
+                     subject, 
+                     message, 
+                     ackdata, 
+                     int(time.time()), # sentTime (this will never change)
+                     int(time.time()), # lastActionTime
+                     0, # sleepTill time. This will get set when the POW gets done.
+                     'broadcastqueued', 
+                     0, # retryNumber
+                     'sent', # folder
+                     encoding, # encoding type
+                     BMConfigParser().getint('bitmessagesettings', 'ttl')
+                     )
                 sqlExecute(
                     '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t)
 
                 toLabel = str_broadcast_subscribers
-
+                
                 self.displayNewSentMessage(
                     toAddress, toLabel, fromAddress, subject, message, ackdata)
 
@@ -2400,8 +2145,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     "MainWindow", "Broadcast queued."))
 
     def click_pushButtonLoadFromAddressBook(self):
-        """TBC"""
-
         self.ui.tabWidget.setCurrentIndex(5)
         for i in range(4):
             time.sleep(0.1)
@@ -2414,8 +2157,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             ))
 
     def click_pushButtonFetchNamecoinID(self):
-        """TBC"""
-
         nc = namecoinConnection()
         identities = str(self.ui.lineEditTo.text().toUtf8()).split(";")
         err, addr = nc.query(identities[-1].strip())
@@ -2429,8 +2170,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 "MainWindow", "Fetched address from namecoin identity."))
 
     def setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress(self, address):
-        """If this is a chan then don't let people broadcast because no one should subscribe to chan addresses."""
-
+        # If this is a chan then don't let people broadcast because no one
+        # should subscribe to chan addresses.
         self.ui.tabWidgetSend.setCurrentIndex(
             self.ui.tabWidgetSend.indexOf(
                 self.ui.sendBroadcast
@@ -2439,20 +2180,17 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             ))
 
     def rerenderComboBoxSendFrom(self):
-        """TBC"""
-
         self.ui.comboBoxSendFrom.clear()
         for addressInKeysFile in getSortedAccounts():
-
-            # I realize that this is poor programming practice but I don't care. It's easier for others to read.
-            isEnabled = BMConfigParser().getboolean(addressInKeysFile, 'enabled')
+            isEnabled = BMConfigParser().getboolean(
+                addressInKeysFile, 'enabled')  # I realize that this is poor programming practice but I don't care. It's easier for others to read.
             isMaillinglist = BMConfigParser().safeGetBoolean(addressInKeysFile, 'mailinglist')
             if isEnabled and not isMaillinglist:
                 label = unicode(BMConfigParser().get(addressInKeysFile, 'label'), 'utf-8', 'ignore').strip()
                 if label == "":
                     label = addressInKeysFile
                 self.ui.comboBoxSendFrom.addItem(avatarize(addressInKeysFile), label, addressInKeysFile)
-
+#        self.ui.comboBoxSendFrom.model().sort(1, Qt.AscendingOrder)
         for i in range(self.ui.comboBoxSendFrom.count()):
             address = str(self.ui.comboBoxSendFrom.itemData(
                 i, QtCore.Qt.UserRole).toString())
@@ -2460,26 +2198,22 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 i, AccountColor(address).accountColor(),
                 QtCore.Qt.ForegroundRole)
         self.ui.comboBoxSendFrom.insertItem(0, '', '')
-        if self.ui.comboBoxSendFrom.count() == 2:
+        if(self.ui.comboBoxSendFrom.count() == 2):
             self.ui.comboBoxSendFrom.setCurrentIndex(1)
         else:
             self.ui.comboBoxSendFrom.setCurrentIndex(0)
 
     def rerenderComboBoxSendFromBroadcast(self):
-        """TBC"""
-
         self.ui.comboBoxSendFromBroadcast.clear()
         for addressInKeysFile in getSortedAccounts():
-
-            # I realize that this is poor programming practice but I don't care. It's easier for others to read.
-            isEnabled = BMConfigParser().getboolean(addressInKeysFile, 'enabled')
+            isEnabled = BMConfigParser().getboolean(
+                addressInKeysFile, 'enabled')  # I realize that this is poor programming practice but I don't care. It's easier for others to read.
             isChan = BMConfigParser().safeGetBoolean(addressInKeysFile, 'chan')
             if isEnabled and not isChan:
                 label = unicode(BMConfigParser().get(addressInKeysFile, 'label'), 'utf-8', 'ignore').strip()
                 if label == "":
                     label = addressInKeysFile
                 self.ui.comboBoxSendFromBroadcast.addItem(avatarize(addressInKeysFile), label, addressInKeysFile)
-
         for i in range(self.ui.comboBoxSendFromBroadcast.count()):
             address = str(self.ui.comboBoxSendFromBroadcast.itemData(
                 i, QtCore.Qt.UserRole).toString())
@@ -2487,19 +2221,16 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 i, AccountColor(address).accountColor(),
                 QtCore.Qt.ForegroundRole)
         self.ui.comboBoxSendFromBroadcast.insertItem(0, '', '')
-        if self.ui.comboBoxSendFromBroadcast.count() == 2:
+        if(self.ui.comboBoxSendFromBroadcast.count() == 2):
             self.ui.comboBoxSendFromBroadcast.setCurrentIndex(1)
         else:
             self.ui.comboBoxSendFromBroadcast.setCurrentIndex(0)
 
+    # This function is called by the processmsg function when that function
+    # receives a message to an address that is acting as a
+    # pseudo-mailing-list. The message will be broadcast out. This function
+    # puts the message on the 'Sent' tab.
     def displayNewSentMessage(self, toAddress, toLabel, fromAddress, subject, message, ackdata):
-        """
-        This function is called by the processmsg function when that function
-        receives a message to an address that is acting as a
-        pseudo-mailing-list. The message will be broadcast out. This function
-        puts the message on the 'Sent' tab.
-        """
-
         acct = accountClass(fromAddress)
         acct.parseMessage(toAddress, fromAddress, subject, message)
         tab = -1
@@ -2510,33 +2241,18 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             treeWidget = self.widgetConvert(sent)
             if self.getCurrentFolder(treeWidget) != "sent":
                 continue
-            if (
-                    treeWidget == self.ui.treeWidgetYourIdentities and
-                    self.getCurrentAccount(treeWidget) not in (fromAddress, None, False)
-            ):
+            if treeWidget == self.ui.treeWidgetYourIdentities and self.getCurrentAccount(treeWidget) not in (fromAddress, None, False):
                 continue
-            elif (
-                    treeWidget in [self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans] and
-                    self.getCurrentAccount(treeWidget) != toAddress
-            ):
+            elif treeWidget in [self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans] and self.getCurrentAccount(treeWidget) != toAddress:
                 continue
-            elif not helper_search.check_match(
-                    toAddress,
-                    fromAddress,
-                    subject,
-                    message,
-                    self.getCurrentSearchOption(tab),
-                    self.getCurrentSearchLine(tab),
-            ):
+            elif not helper_search.check_match(toAddress, fromAddress, subject, message, self.getCurrentSearchOption(tab), self.getCurrentSearchLine(tab)):
                 continue
-
+            
             self.addMessageListItemSent(sent, toAddress, fromAddress, subject, "msgqueued", ackdata, time.time())
             self.getAccountTextedit(acct).setPlainText(unicode(message, 'utf-8', 'replace'))
             sent.setCurrentCell(0, 0)
 
     def displayNewInboxMessage(self, inventoryHash, toAddress, fromAddress, subject, message):
-        """TBC"""
-
         if toAddress == str_broadcast_subscribers:
             acct = accountClass(fromAddress)
         else:
@@ -2544,54 +2260,17 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         inbox = self.getAccountMessagelist(acct)
         ret = None
         tab = -1
-        for treeWidget in [
-                self.ui.treeWidgetYourIdentities,
-                self.ui.treeWidgetSubscriptions,
-                self.ui.treeWidgetChans,
-        ]:
+        for treeWidget in [self.ui.treeWidgetYourIdentities, self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans]:
             tab += 1
             if tab == 1:
                 tab = 2
             tableWidget = self.widgetConvert(treeWidget)
-            if not helper_search.check_match(
-                    toAddress,
-                    fromAddress,
-                    subject,
-                    message,
-                    self.getCurrentSearchOption(tab),
-                    self.getCurrentSearchLine(tab),
-            ):
+            if not helper_search.check_match(toAddress, fromAddress, subject, message, self.getCurrentSearchOption(tab), self.getCurrentSearchLine(tab)):
                 continue
-            if (
-                    tableWidget == inbox and
-                    self.getCurrentAccount(treeWidget) == acct.address and
-                    self.getCurrentFolder(treeWidget) in ["inbox", None]
-            ):
-                ret = self.addMessageListItemInbox(
-                    inbox,
-                    "inbox",
-                    inventoryHash,
-                    toAddress,
-                    fromAddress,
-                    subject,
-                    time.time(),
-                    0,
-                )
-            elif (
-                    treeWidget == self.ui.treeWidgetYourIdentities and
-                    self.getCurrentAccount(treeWidget) is None and
-                    self.getCurrentFolder(treeWidget) in ["inbox", "new", None]
-            ):
-                ret = self.addMessageListItemInbox(
-                    tableWidget,
-                    "inbox",
-                    inventoryHash,
-                    toAddress,
-                    fromAddress,
-                    subject,
-                    time.time(),
-                    0,
-                )
+            if tableWidget == inbox and self.getCurrentAccount(treeWidget) == acct.address and self.getCurrentFolder(treeWidget) in ["inbox", None]:
+                ret = self.addMessageListItemInbox(inbox, "inbox", inventoryHash, toAddress, fromAddress, subject, time.time(), 0)
+            elif treeWidget == self.ui.treeWidgetYourIdentities and self.getCurrentAccount(treeWidget) is None and self.getCurrentFolder(treeWidget) in ["inbox", "new", None]:
+                ret = self.addMessageListItemInbox(tableWidget, "inbox", inventoryHash, toAddress, fromAddress, subject, time.time(), 0)
         if ret is None:
             acct.parseMessage(toAddress, fromAddress, subject, "")
         else:
@@ -2605,26 +2284,18 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     unicode(acct.fromLabel, 'utf-8')),
                 sound.SOUND_UNKNOWN
             )
-        # pylint: disable=undefined-loop-variable
-        if (
-                self.getCurrentAccount() is not None and (
-                    self.getCurrentFolder(treeWidget) not in ("inbox", None) or
-                    self.getCurrentAccount(treeWidget) != acct.address
-                )
-        ):
+        if self.getCurrentAccount() is not None and ((self.getCurrentFolder(treeWidget) != "inbox" and self.getCurrentFolder(treeWidget) is not None) or self.getCurrentAccount(treeWidget) != acct.address):
             # Ubuntu should notify of new message irespective of
             # whether it's in current message list or not
             self.indicatorUpdate(True, to_label=acct.toLabel)
             # cannot find item to pass here ):
-        if hasattr(acct, "feedback") and acct.feedback != GatewayAccount.ALL_OK:
+        if hasattr(acct, "feedback") \
+                and acct.feedback != GatewayAccount.ALL_OK:
             if acct.feedback == GatewayAccount.REGISTRATION_DENIED:
                 dialogs.EmailGatewayDialog(
                     self, BMConfigParser(), acct).exec_()
-        # pylint: enable=undefined-loop-variable
 
     def click_pushButtonAddAddressBook(self, dialog=None):
-        """TBC"""
-
         if not dialog:
             dialog = dialogs.AddAddressDialog(self)
         dialog.exec_()
@@ -2648,8 +2319,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.addEntryToAddressBook(address, label)
 
     def addEntryToAddressBook(self, address, label):
-        """TBC"""
-
         if shared.isAddressInMyAddressBook(address):
             return
         sqlExecute('''INSERT INTO addressbook VALUES (?,?)''', label, address)
@@ -2658,8 +2327,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.rerenderAddressBook()
 
     def addSubscription(self, address, label):
-        """TBC"""
-
         # This should be handled outside of this function, for error displaying
         # and such, but it must also be checked here.
         if shared.isAddressInMySubscriptionsList(address):
@@ -2675,8 +2342,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.rerenderTabTreeSubscriptions()
 
     def click_pushButtonAddSubscription(self):
-        """TBC"""
-
         dialog = dialogs.NewSubscriptionDialog(self)
         dialog.exec_()
         try:
@@ -2707,28 +2372,18 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 ))
 
     def click_pushButtonStatusIcon(self):
-        """TBC"""
-
         dialogs.IconGlossaryDialog(self, config=BMConfigParser()).exec_()
 
     def click_actionHelp(self):
-        """TBC"""
-
         dialogs.HelpDialog(self).exec_()
 
     def click_actionSupport(self):
-        """TBC"""
-
         support.createSupportMessage(self)
 
     def click_actionAbout(self):
-        """TBC"""
-
         dialogs.AboutDialog(self).exec_()
 
     def click_actionSettings(self):
-        """TBC"""
-
         self.settingsDialogInstance = settingsDialog(self)
         if self._firstrun:
             self.settingsDialogInstance.ui.tabWidgetSettings.setCurrentIndex(1)
@@ -2754,51 +2409,32 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 self.settingsDialogInstance.ui.checkBoxUseIdenticons.isChecked()))
             BMConfigParser().set('bitmessagesettings', 'replybelow', str(
                 self.settingsDialogInstance.ui.checkBoxReplyBelow.isChecked()))
-
-            lang = str(self.settingsDialogInstance.ui.languageComboBox.itemData(
-                self.settingsDialogInstance.ui.languageComboBox.currentIndex()).toString())
+                
+            lang = str(self.settingsDialogInstance.ui.languageComboBox.itemData(self.settingsDialogInstance.ui.languageComboBox.currentIndex()).toString())
             BMConfigParser().set('bitmessagesettings', 'userlocale', lang)
             change_translation(l10n.getTranslationLanguage())
-
-            if int(BMConfigParser().get('bitmessagesettings', 'port')) != int(
-                    self.settingsDialogInstance.ui.lineEditTCPPort.text()):
+            
+            if int(BMConfigParser().get('bitmessagesettings', 'port')) != int(self.settingsDialogInstance.ui.lineEditTCPPort.text()):
                 if not BMConfigParser().safeGetBoolean('bitmessagesettings', 'dontconnect'):
                     QtGui.QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate(
                         "MainWindow", "You must restart Bitmessage for the port number change to take effect."))
                 BMConfigParser().set('bitmessagesettings', 'port', str(
                     self.settingsDialogInstance.ui.lineEditTCPPort.text()))
-            if self.settingsDialogInstance.ui.checkBoxUPnP.isChecked() != BMConfigParser().safeGetBoolean(
-                    'bitmessagesettings', 'upnp'
-            ):
-
-                BMConfigParser().set(
-                    'bitmessagesettings', 'upnp',
-                    str(self.settingsDialogInstance.ui.checkBoxUPnP.isChecked()))
+            if self.settingsDialogInstance.ui.checkBoxUPnP.isChecked() != BMConfigParser().safeGetBoolean('bitmessagesettings', 'upnp'):
+                BMConfigParser().set('bitmessagesettings', 'upnp', str(self.settingsDialogInstance.ui.checkBoxUPnP.isChecked()))
                 if self.settingsDialogInstance.ui.checkBoxUPnP.isChecked():
+                    import upnp
                     upnpThread = upnp.uPnPThread()
                     upnpThread.start()
-
-            if (
-                    BMConfigParser().get('bitmessagesettings', 'socksproxytype') == 'none' and
-                    self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] == 'SOCKS'
-            ):
+            #print 'self.settingsDialogInstance.ui.comboBoxProxyType.currentText()', self.settingsDialogInstance.ui.comboBoxProxyType.currentText()
+            #print 'self.settingsDialogInstance.ui.comboBoxProxyType.currentText())[0:5]', self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5]
+            if BMConfigParser().get('bitmessagesettings', 'socksproxytype') == 'none' and self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] == 'SOCKS':
                 if shared.statusIconColor != 'red':
-                    QtGui.QMessageBox.about(
-                        self,
-                        _translate(
-                            "MainWindow",
-                            "Restart"),
-                        _translate(
-                            "MainWindow",
-                            ("Bitmessage will use your proxy from now on but you may want to manually restart "
-                             "Bitmessage now to close existing connections (if any).")))
-
-            if (
-                    BMConfigParser().get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and
-                    self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] != 'SOCKS'
-            ):
+                    QtGui.QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate(
+                        "MainWindow", "Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any)."))
+            if BMConfigParser().get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] != 'SOCKS':
                 self.statusbar.clearMessage()
-            state.resetNetworkProtocolAvailability()  # just in case we changed something in the network connectivity
+            state.resetNetworkProtocolAvailability() # just in case we changed something in the network connectivity
             if self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] == 'SOCKS':
                 BMConfigParser().set('bitmessagesettings', 'socksproxytype', str(
                     self.settingsDialogInstance.ui.comboBoxProxyType.currentText()))
@@ -2827,13 +2463,13 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     "MainWindow", "Your maximum download and upload rate must be numbers. Ignoring what you typed."))
             else:
                 set_rates(BMConfigParser().safeGetInt("bitmessagesettings", "maxdownloadrate"),
-                          BMConfigParser().safeGetInt("bitmessagesettings", "maxuploadrate"))
+                    BMConfigParser().safeGetInt("bitmessagesettings", "maxuploadrate"))
 
             BMConfigParser().set('bitmessagesettings', 'maxoutboundconnections', str(
                 int(float(self.settingsDialogInstance.ui.lineEditMaxOutboundConnections.text()))))
 
             BMConfigParser().set('bitmessagesettings', 'namecoinrpctype',
-                                 self.settingsDialogInstance.getNamecoinType())
+                self.settingsDialogInstance.getNamecoinType())
             BMConfigParser().set('bitmessagesettings', 'namecoinrpchost', str(
                 self.settingsDialogInstance.ui.lineEditNamecoinHost.text()))
             BMConfigParser().set('bitmessagesettings', 'namecoinrpcport', str(
@@ -2842,79 +2478,46 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 self.settingsDialogInstance.ui.lineEditNamecoinUser.text()))
             BMConfigParser().set('bitmessagesettings', 'namecoinrpcpassword', str(
                 self.settingsDialogInstance.ui.lineEditNamecoinPassword.text()))
-
+            
             # Demanded difficulty tab
             if float(self.settingsDialogInstance.ui.lineEditTotalDifficulty.text()) >= 1:
                 BMConfigParser().set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(int(float(
-                    self.settingsDialogInstance.ui.lineEditTotalDifficulty.text()
-                ) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte)))
+                    self.settingsDialogInstance.ui.lineEditTotalDifficulty.text()) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte)))
             if float(self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text()) >= 1:
                 BMConfigParser().set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(int(float(
-                    self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text()
-                ) * defaults.networkDefaultPayloadLengthExtraBytes)))
+                    self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text()) * defaults.networkDefaultPayloadLengthExtraBytes)))
 
-            if self.settingsDialogInstance.ui.comboBoxOpenCL.currentText().toUtf8(
-            ) != BMConfigParser().safeGet("bitmessagesettings", "opencl"):
-                BMConfigParser().set(
-                    'bitmessagesettings', 'opencl',
-                    str(self.settingsDialogInstance.ui.comboBoxOpenCL.currentText()))
+            if self.settingsDialogInstance.ui.comboBoxOpenCL.currentText().toUtf8() != BMConfigParser().safeGet("bitmessagesettings", "opencl"):
+                BMConfigParser().set('bitmessagesettings', 'opencl', str(self.settingsDialogInstance.ui.comboBoxOpenCL.currentText()))
                 queues.workerQueue.put(('resetPoW', ''))
 
             acceptableDifficultyChanged = False
-
-            if (
-                    float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) >= 1 or
-                    float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) == 0
-            ):
-                if BMConfigParser().get(
-                        'bitmessagesettings',
-                        'maxacceptablenoncetrialsperbyte',
-                ) != str(
-                    int(
-                        float(
-                            self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()
-                        ) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte
-                    )
-                ):
+            
+            if float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) >= 1 or float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) == 0:
+                if BMConfigParser().get('bitmessagesettings','maxacceptablenoncetrialsperbyte') != str(int(float(
+                    self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte)):
                     # the user changed the max acceptable total difficulty
                     acceptableDifficultyChanged = True
                     BMConfigParser().set('bitmessagesettings', 'maxacceptablenoncetrialsperbyte', str(int(float(
-                        self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()
-                    ) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte)))
-
-            if (
-                    float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) >= 1 or
-                    float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) == 0
-            ):
-                if BMConfigParser().get(
-                        'bitmessagesettings',
-                        'maxacceptablepayloadlengthextrabytes',
-                ) != str(
-                    int(
-                        float(
-                            self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()
-                        ) * defaults.networkDefaultPayloadLengthExtraBytes
-                    )
-                ):
+                        self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte)))
+            if float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) >= 1 or float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) == 0:
+                if BMConfigParser().get('bitmessagesettings','maxacceptablepayloadlengthextrabytes') != str(int(float(
+                    self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) * defaults.networkDefaultPayloadLengthExtraBytes)):
                     # the user changed the max acceptable small message difficulty
                     acceptableDifficultyChanged = True
                     BMConfigParser().set('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', str(int(float(
-                        self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()
-                    ) * defaults.networkDefaultPayloadLengthExtraBytes)))
+                        self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) * defaults.networkDefaultPayloadLengthExtraBytes)))
             if acceptableDifficultyChanged:
-                # It might now be possible to send msgs which were previously marked as toodifficult.
+                # It might now be possible to send msgs which were previously marked as toodifficult. 
                 # Let us change them to 'msgqueued'. The singleWorker will try to send them and will again
                 # mark them as toodifficult if the receiver's required difficulty is still higher than
                 # we are willing to do.
                 sqlExecute('''UPDATE sent SET status='msgqueued' WHERE status='toodifficult' ''')
                 queues.workerQueue.put(('sendmessage', ''))
-
-            # start:UI setting to stop trying to send messages after X days/months
+            
+            #start:UI setting to stop trying to send messages after X days/months
             # I'm open to changing this UI to something else if someone has a better idea.
-            if (
-                    self.settingsDialogInstance.ui.lineEditDays.text() == '' and
-                    self.settingsDialogInstance.ui.lineEditMonths.text() == ''
-            ):  # We need to handle this special case. Bitmessage has its default behavior. The input is blank/blank
+            if ((self.settingsDialogInstance.ui.lineEditDays.text()=='') and (self.settingsDialogInstance.ui.lineEditMonths.text()=='')):#We need to handle this special case. Bitmessage has its default behavior. The input is blank/blank
                 BMConfigParser().set('bitmessagesettings', 'stopresendingafterxdays', '')
                 BMConfigParser().set('bitmessagesettings', 'stopresendingafterxmonths', '')
                 shared.maximumLengthOfTimeToBotherResendingMessages = float('inf')
@@ -2933,39 +2536,24 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             if lineEditMonthsIsValidFloat and not lineEditDaysIsValidFloat:
                 self.settingsDialogInstance.ui.lineEditDays.setText("0")
             if lineEditDaysIsValidFloat or lineEditMonthsIsValidFloat:
-                if (
-                        float(self.settingsDialogInstance.ui.lineEditDays.text()) >= 0 and
-                        float(self.settingsDialogInstance.ui.lineEditMonths.text()) >= 0
-                ):
-                    shared.maximumLengthOfTimeToBotherResendingMessages = sum(
-                        float(str(self.settingsDialogInstance.ui.lineEditDays.text())) * 24 * 60 * 60,
-                        float(str(self.settingsDialogInstance.ui.lineEditMonths.text())) * (60 * 60 * 24 * 365) / 12,
-                    )
-                    # If the time period is less than 5 hours, we give zero values to all
-                    # fields. No message will be sent again.
-                    if shared.maximumLengthOfTimeToBotherResendingMessages < 432000:
-                        QtGui.QMessageBox.about(
-                            self,
-                            _translate(
-                                "MainWindow",
-                                "Will not resend ever"),
-                            _translate(
-                                "MainWindow",
-                                ("Note that the time limit you entered is less than the amount of time Bitmessage "
-                                 "waits for the first resend attempt therefore your messages will never be resent.")))
+                if (float(self.settingsDialogInstance.ui.lineEditDays.text()) >=0 and float(self.settingsDialogInstance.ui.lineEditMonths.text()) >=0):
+                    shared.maximumLengthOfTimeToBotherResendingMessages = (float(str(self.settingsDialogInstance.ui.lineEditDays.text())) * 24 * 60 * 60) + (float(str(self.settingsDialogInstance.ui.lineEditMonths.text())) * (60 * 60 * 24 *365)/12)
+                    if shared.maximumLengthOfTimeToBotherResendingMessages < 432000: # If the time period is less than 5 hours, we give zero values to all fields. No message will be sent again.
+                        QtGui.QMessageBox.about(self, _translate("MainWindow", "Will not resend ever"), _translate(
+                            "MainWindow", "Note that the time limit you entered is less than the amount of time Bitmessage waits for the first resend attempt therefore your messages will never be resent."))
                         BMConfigParser().set('bitmessagesettings', 'stopresendingafterxdays', '0')
                         BMConfigParser().set('bitmessagesettings', 'stopresendingafterxmonths', '0')
                         shared.maximumLengthOfTimeToBotherResendingMessages = 0
                     else:
                         BMConfigParser().set('bitmessagesettings', 'stopresendingafterxdays', str(float(
-                            self.settingsDialogInstance.ui.lineEditDays.text())))
+                        self.settingsDialogInstance.ui.lineEditDays.text())))
                         BMConfigParser().set('bitmessagesettings', 'stopresendingafterxmonths', str(float(
-                            self.settingsDialogInstance.ui.lineEditMonths.text())))
+                        self.settingsDialogInstance.ui.lineEditMonths.text())))
 
             BMConfigParser().save()
 
             if 'win32' in sys.platform or 'win64' in sys.platform:
-                # Auto-startup for Windows
+            # Auto-startup for Windows
                 RUN_PATH = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run"
                 self.settings = QtCore.QSettings(RUN_PATH, QtCore.QSettings.NativeFormat)
                 if BMConfigParser().getboolean('bitmessagesettings', 'startonlogon'):
@@ -2979,56 +2567,46 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 # startup for linux
                 pass
 
-            # If we are NOT using portable mode now but the user selected that we should...
-            if state.appdata != paths.lookupExeFolder():
-                if self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked():
+            if state.appdata != paths.lookupExeFolder() and self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked():  # If we are NOT using portable mode now but the user selected that we should...
+                # Write the keys.dat file to disk in the new location
+                sqlStoredProcedure('movemessagstoprog')
+                with open(paths.lookupExeFolder() + 'keys.dat', 'wb') as configfile:
+                    BMConfigParser().write(configfile)
+                # Write the knownnodes.dat file to disk in the new location
+                knownnodes.saveKnownNodes(paths.lookupExeFolder())
+                os.remove(state.appdata + 'keys.dat')
+                os.remove(state.appdata + 'knownnodes.dat')
+                previousAppdataLocation = state.appdata
+                state.appdata = paths.lookupExeFolder()
+                debug.restartLoggingInUpdatedAppdataLocation()
+                try:
+                    os.remove(previousAppdataLocation + 'debug.log')
+                    os.remove(previousAppdataLocation + 'debug.log.1')
+                except:
+                    pass
 
-                    # Write the keys.dat file to disk in the new location
-                    sqlStoredProcedure('movemessagstoprog')
-                    with open(paths.lookupExeFolder() + 'keys.dat', 'wb') as configfile:
-                        BMConfigParser().write(configfile)
-                    # Write the knownnodes.dat file to disk in the new location
-                    knownnodes.saveKnownNodes(paths.lookupExeFolder())
-                    os.remove(state.appdata + 'keys.dat')
-                    os.remove(state.appdata + 'knownnodes.dat')
-                    previousAppdataLocation = state.appdata
-                    state.appdata = paths.lookupExeFolder()
-                    debug.restartLoggingInUpdatedAppdataLocation()
-                    try:
-                        os.remove(previousAppdataLocation + 'debug.log')
-                        os.remove(previousAppdataLocation + 'debug.log.1')
-                    except:
-                        pass
-
-            # If we ARE using portable mode now but the user selected that we shouldn't...
-            if state.appdata == paths.lookupExeFolder():
-                if not self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked():
-
-                    state.appdata = paths.lookupAppdataFolder()
-                    if not os.path.exists(state.appdata):
-                        os.makedirs(state.appdata)
-                    sqlStoredProcedure('movemessagstoappdata')
-                    # Write the keys.dat file to disk in the new location
-                    BMConfigParser().save()
-                    # Write the knownnodes.dat file to disk in the new location
-                    knownnodes.saveKnownNodes(state.appdata)
-                    os.remove(paths.lookupExeFolder() + 'keys.dat')
-                    os.remove(paths.lookupExeFolder() + 'knownnodes.dat')
-                    debug.restartLoggingInUpdatedAppdataLocation()
-                    try:
-                        os.remove(paths.lookupExeFolder() + 'debug.log')
-                        os.remove(paths.lookupExeFolder() + 'debug.log.1')
-                    except:
-                        pass
+            if state.appdata == paths.lookupExeFolder() and not self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked():  # If we ARE using portable mode now but the user selected that we shouldn't...
+                state.appdata = paths.lookupAppdataFolder()
+                if not os.path.exists(state.appdata):
+                    os.makedirs(state.appdata)
+                sqlStoredProcedure('movemessagstoappdata')
+                # Write the keys.dat file to disk in the new location
+                BMConfigParser().save()
+                # Write the knownnodes.dat file to disk in the new location
+                knownnodes.saveKnownNodes(state.appdata)
+                os.remove(paths.lookupExeFolder() + 'keys.dat')
+                os.remove(paths.lookupExeFolder() + 'knownnodes.dat')
+                debug.restartLoggingInUpdatedAppdataLocation()
+                try:
+                    os.remove(paths.lookupExeFolder() + 'debug.log')
+                    os.remove(paths.lookupExeFolder() + 'debug.log.1')
+                except:
+                    pass
 
     def on_action_SpecialAddressBehaviorDialog(self):
-        """TBC"""
-
         dialogs.SpecialAddressBehaviorDialog(self, BMConfigParser())
 
     def on_action_EmailGatewayDialog(self):
-        """TBC"""
-
         dialog = dialogs.EmailGatewayDialog(self, config=BMConfigParser())
         # For Modal dialogs
         dialog.exec_()
@@ -3059,8 +2637,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.ui.textEditMessage.setFocus()
 
     def on_action_MarkAllRead(self):
-        """TBC"""
-
         if QtGui.QMessageBox.question(
                 self, "Marking all messages as read?",
                 _translate(
@@ -3097,16 +2673,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
         if markread > 0:
             self.propagateUnreadCount()
-            # addressAtCurrentRow, self.getCurrentFolder(), None, 0)
+                # addressAtCurrentRow, self.getCurrentFolder(), None, 0)
 
     def click_NewAddressDialog(self):
-        """TBC"""
-
         dialogs.NewAddressDialog(self)
 
     def network_switch(self):
-        """TBC"""
-
         dontconnect_option = not BMConfigParser().safeGetBoolean(
             'bitmessagesettings', 'dontconnect')
         BMConfigParser().set(
@@ -3118,8 +2690,15 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             dontconnect_option or self.namecoin.test()[0] == 'failed'
         )
 
+    # Quit selected from menu or application indicator
     def quit(self):
-        """Quit selected from menu or application indicator"""
+        '''quit_msg = "Are you sure you want to exit Bitmessage?"
+        reply = QtGui.QMessageBox.question(self, 'Message',
+                         quit_msg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+
+        if reply is QtGui.QMessageBox.No:
+            return
+        '''
 
         if self.quitAccepted:
             return
@@ -3134,50 +2713,20 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
         # C PoW currently doesn't support interrupting and OpenCL is untested
         if getPowType() == "python" and (powQueueSize() > 0 or pendingUpload() > 0):
-            reply = QtGui.QMessageBox.question(
-                self,
-                _translate(
-                    "MainWindow",
-                    "Proof of work pending"),
-                _translate(
-                    "MainWindow",
-                    "%n object(s) pending proof of work",
-                    None,
-                    QtCore.QCoreApplication.CodecForTr,
-                    powQueueSize()) +
-                ", " +
-                _translate(
-                    "MainWindow",
-                    "%n object(s) waiting to be distributed",
-                    None,
-                    QtCore.QCoreApplication.CodecForTr,
-                    pendingUpload()) +
-                "\n\n" +
-                _translate(
-                    "MainWindow",
-                    "Wait until these tasks finish?"),
-                QtGui.QMessageBox.Yes | QtGui.QMessageBox.No | QtGui.QMessageBox.Cancel,
-                QtGui.QMessageBox.Cancel)
+            reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Proof of work pending"),
+                    _translate("MainWindow", "%n object(s) pending proof of work", None, QtCore.QCoreApplication.CodecForTr, powQueueSize()) + ", " +
+                    _translate("MainWindow", "%n object(s) waiting to be distributed", None, QtCore.QCoreApplication.CodecForTr, pendingUpload()) + "\n\n" + 
+                    _translate("MainWindow", "Wait until these tasks finish?"),
+                    QtGui.QMessageBox.Yes|QtGui.QMessageBox.No|QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Cancel)
             if reply == QtGui.QMessageBox.No:
                 waitForPow = False
             elif reply == QtGui.QMessageBox.Cancel:
                 return
 
         if pendingDownload() > 0:
-            reply = QtGui.QMessageBox.question(
-                self,
-                _translate(
-                    "MainWindow",
-                    "Synchronisation pending"),
-                _translate(
-                    "MainWindow",
-                    ("Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit "
-                     "now, it may cause delivery delays. Wait until the synchronisation finishes?"),
-                    None,
-                    QtCore.QCoreApplication.CodecForTr,
-                    pendingDownload()),
-                QtGui.QMessageBox.Yes | QtGui.QMessageBox.No | QtGui.QMessageBox.Cancel,
-                QtGui.QMessageBox.Cancel)
+            reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Synchronisation pending"),
+                    _translate("MainWindow", "Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit now, it may cause delivery delays. Wait until the synchronisation finishes?", None, QtCore.QCoreApplication.CodecForTr, pendingDownload()),
+                    QtGui.QMessageBox.Yes|QtGui.QMessageBox.No|QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Cancel)
             if reply == QtGui.QMessageBox.Yes:
                 waitForSync = True
             elif reply == QtGui.QMessageBox.Cancel:
@@ -3185,17 +2734,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
         if shared.statusIconColor == 'red' and not BMConfigParser().safeGetBoolean(
                 'bitmessagesettings', 'dontconnect'):
-            reply = QtGui.QMessageBox.question(
-                self,
-                _translate(
-                    "MainWindow",
-                    "Not connected"),
-                _translate(
-                    "MainWindow",
-                    ("Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. "
-                     "Wait until connected and the synchronisation finishes?")),
-                QtGui.QMessageBox.Yes | QtGui.QMessageBox.No | QtGui.QMessageBox.Cancel,
-                QtGui.QMessageBox.Cancel)
+            reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Not connected"),
+                    _translate("MainWindow", "Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. Wait until connected and the synchronisation finishes?"),
+                    QtGui.QMessageBox.Yes|QtGui.QMessageBox.No|QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Cancel)
             if reply == QtGui.QMessageBox.Yes:
                 waitForConnection = True
                 waitForSync = True
@@ -3216,9 +2757,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     QtCore.QEventLoop.AllEvents, 1000
                 )
 
-        # this probably will not work correctly, because there is a delay between
-        # the status icon turning red and inventory exchange, but it's better than
-        # nothing.
+        # this probably will not work correctly, because there is a delay between the status icon turning red and inventory exchange, but it's better than nothing.
         if waitForSync:
             self.updateStatusBar(_translate(
                 "MainWindow", "Waiting for finishing synchronisation..."))
@@ -3238,11 +2777,10 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 if curWorkerQueue > maxWorkerQueue:
                     maxWorkerQueue = curWorkerQueue
                 if curWorkerQueue > 0:
-                    self.updateStatusBar(
-                        _translate(
-                            "MainWindow",
-                            "Waiting for PoW to finish... %1%",
-                        ).arg(50 * (maxWorkerQueue - curWorkerQueue) / maxWorkerQueue)
+                    self.updateStatusBar(_translate(
+                        "MainWindow", "Waiting for PoW to finish... %1%"
+                        ).arg(50 * (maxWorkerQueue - curWorkerQueue)
+                              / maxWorkerQueue)
                     )
                     time.sleep(0.5)
                     QtCore.QCoreApplication.processEvents(
@@ -3266,13 +2804,12 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.updateStatusBar(_translate(
                 "MainWindow", "Waiting for objects to be sent... %1%").arg(50))
             maxPendingUpload = max(1, pendingUpload())
-
+                   
             while pendingUpload() > 1:
-                self.updateStatusBar(
-                    _translate(
-                        "MainWindow",
-                        "Waiting for objects to be sent... %1%"
-                    ).arg(int(50 + 20 * (pendingUpload() / maxPendingUpload)))
+                self.updateStatusBar(_translate(
+                    "MainWindow",
+                    "Waiting for objects to be sent... %1%"
+                    ).arg(int(50 + 20 * (pendingUpload()/maxPendingUpload)))
                 )
                 time.sleep(0.5)
                 QtCore.QCoreApplication.processEvents(
@@ -3315,11 +2852,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         shared.thisapp.cleanup()
         logger.info("Shutdown complete")
         super(MyForm, myapp).close()
-        sys.exit(0)
+        # return
+        os._exit(0)
 
+    # window close event
     def closeEvent(self, event):
-        """window close event"""
-
         self.appIndicatorHide()
         trayonclose = False
 
@@ -3340,8 +2877,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.quit()
 
     def on_action_InboxMessageForceHtml(self):
-        """TBC"""
-
         msgid = self.getCurrentMessageId()
         textEdit = self.getCurrentMessageTextedit()
         if not msgid:
@@ -3360,54 +2895,60 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     lines[i])
             elif lines[i] == '------------------------------------------------------':
                 lines[i] = '<hr>'
-            elif lines[i] == '' and (i + 1) < totalLines and \
-                    lines[i + 1] != '------------------------------------------------------':
+            elif lines[i] == '' and (i+1) < totalLines and \
+                 lines[i+1] != '------------------------------------------------------':
                 lines[i] = '<br><br>'
-        content = ' '.join(lines)  # To keep the whitespace between lines
+        content = ' '.join(lines) # To keep the whitespace between lines
         content = shared.fixPotentiallyInvalidUTF8Data(content)
         content = unicode(content, 'utf-8)')
         textEdit.setHtml(QtCore.QString(content))
 
     def on_action_InboxMarkUnread(self):
-        """TBC"""
-
         tableWidget = self.getCurrentMessagelist()
         if not tableWidget:
             return
 
         msgids = set()
+        # modified = 0
         for row in tableWidget.selectedIndexes():
             currentRow = row.row()
             msgid = str(tableWidget.item(
                 currentRow, 3).data(QtCore.Qt.UserRole).toPyObject())
             msgids.add(msgid)
+            # if not tableWidget.item(currentRow, 0).unread:
+            #     modified += 1
             self.updateUnreadStatus(tableWidget, currentRow, msgid, False)
 
+        # for 1081
         idCount = len(msgids)
+        # rowcount =
         sqlExecuteChunked(
             '''UPDATE inbox SET read=0 WHERE msgid IN ({0}) AND read=1''',
             idCount, *msgids
         )
 
         self.propagateUnreadCount()
+        # if rowcount == 1:
+        #     # performance optimisation
+        #     self.propagateUnreadCount(tableWidget.item(currentRow, 1 if tableWidget.item(currentRow, 1).type == AccountMixin.SUBSCRIPTION else 0).data(QtCore.Qt.UserRole), self.getCurrentFolder())
+        # else:
+        #     self.propagateUnreadCount(tableWidget.item(currentRow, 1 if tableWidget.item(currentRow, 1).type == AccountMixin.SUBSCRIPTION else 0).data(QtCore.Qt.UserRole), self.getCurrentFolder(), self.getCurrentTreeWidget(), 0)
+        # tableWidget.selectRow(currentRow + 1) 
+        # This doesn't de-select the last message if you try to mark it unread, but that doesn't interfere. Might not be necessary.
+        # We could also select upwards, but then our problem would be with the topmost message.
+        # tableWidget.clearSelection() manages to mark the message as read again.
 
+    # Format predefined text on message reply.
     def quoted_text(self, message):
-        """Format predefined text on message reply."""
-
         if not BMConfigParser().safeGetBoolean('bitmessagesettings', 'replybelow'):
-            return '\n\n------------------------------------------------------\n' + message
-
-        quoteWrapper = textwrap.TextWrapper(
-            replace_whitespace=False,
-            initial_indent='> ',
-            subsequent_indent='> ',
-            break_long_words=False,
-            break_on_hyphens=False,
-        )
+          return '\n\n------------------------------------------------------\n' + message
 
+        quoteWrapper = textwrap.TextWrapper(replace_whitespace = False,
+                                            initial_indent = '> ',
+                                            subsequent_indent = '> ',
+                                            break_long_words = False,
+                                            break_on_hyphens = False)
         def quote_line(line):
-            """TBC"""
-
             # Do quote empty lines.
             if line == '' or line.isspace():
                 return '> '
@@ -3415,13 +2956,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             elif line[0:2] == '> ':
                 return '> ' + line
             # Wrap and quote lines/paragraphs new to this message.
-            return quoteWrapper.fill(line)
-
+            else:
+                return quoteWrapper.fill(line)
         return '\n'.join([quote_line(l) for l in message.splitlines()]) + '\n\n'
 
-    def setSendFromComboBox(self, address=None):
-        """TBC"""
-
+    def setSendFromComboBox(self, address = None):
         if address is None:
             messagelist = self.getCurrentMessagelist()
             if messagelist:
@@ -3437,23 +2976,19 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 box.setCurrentIndex(0)
 
     def on_action_InboxReplyChan(self):
-        """TBC"""
-
         self.on_action_InboxReply(self.REPLY_TYPE_CHAN)
-
-    def on_action_InboxReply(self, replyType=None):
-        """TBC"""
-
+    
+    def on_action_InboxReply(self, replyType = None):
         tableWidget = self.getCurrentMessagelist()
         if not tableWidget:
             return
-
+        
         if replyType is None:
             replyType = self.REPLY_TYPE_SENDER
-
+        
         # save this to return back after reply is done
         self.replyFromTab = self.ui.tabWidget.currentIndex()
-
+        
         currentInboxRow = tableWidget.currentRow()
         toAddressAtCurrentInboxRow = tableWidget.item(
             currentInboxRow, 0).address
@@ -3467,13 +3002,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         if queryreturn != []:
             for row in queryreturn:
                 messageAtCurrentInboxRow, = row
-        acct.parseMessage(
-            toAddressAtCurrentInboxRow,
-            fromAddressAtCurrentInboxRow,
-            tableWidget.item(
-                currentInboxRow,
-                2).subject,
-            messageAtCurrentInboxRow)
+        acct.parseMessage(toAddressAtCurrentInboxRow, fromAddressAtCurrentInboxRow, tableWidget.item(currentInboxRow, 2).subject, messageAtCurrentInboxRow)
         widget = {
             'subject': self.ui.lineEditSubject,
             'from': self.ui.comboBoxSendFrom,
@@ -3483,23 +3012,13 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.ui.tabWidgetSend.setCurrentIndex(
                 self.ui.tabWidgetSend.indexOf(self.ui.sendDirect)
             )
+#            toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow
         elif not BMConfigParser().has_section(toAddressAtCurrentInboxRow):
-            QtGui.QMessageBox.information(
-                self, _translate("MainWindow", "Address is gone"),
-                _translate("MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(
-                    toAddressAtCurrentInboxRow),
-                QtGui.QMessageBox.Ok)
+            QtGui.QMessageBox.information(self, _translate("MainWindow", "Address is gone"), _translate(
+                "MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(toAddressAtCurrentInboxRow), QtGui.QMessageBox.Ok)
         elif not BMConfigParser().getboolean(toAddressAtCurrentInboxRow, 'enabled'):
-            QtGui.QMessageBox.information(
-                self,
-                _translate(
-                    "MainWindow",
-                    "Address disabled"),
-                _translate(
-                    "MainWindow",
-                    ("Error: The address from which you are trying to send is disabled. You\'ll have to enable it on "
-                     "the \'Your Identities\' tab before using it.")),
-                QtGui.QMessageBox.Ok)
+            QtGui.QMessageBox.information(self, _translate("MainWindow", "Address disabled"), _translate(
+                "MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."), QtGui.QMessageBox.Ok)
         else:
             self.setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress(toAddressAtCurrentInboxRow)
             broadcast_tab_index = self.ui.tabWidgetSend.indexOf(
@@ -3514,31 +3033,21 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 self.ui.tabWidgetSend.setCurrentIndex(broadcast_tab_index)
                 toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow
         if fromAddressAtCurrentInboxRow == tableWidget.item(currentInboxRow, 1).label or (
-                isinstance(acct, GatewayAccount) and fromAddressAtCurrentInboxRow == acct.relayAddress):
+            isinstance(acct, GatewayAccount) and fromAddressAtCurrentInboxRow == acct.relayAddress):
             self.ui.lineEditTo.setText(str(acct.fromAddress))
         else:
-            self.ui.lineEditTo.setText(
-                ''.join(
-                    [
-                        tableWidget.item(currentInboxRow, 1).label,
-                        " <",
-                        str(acct.fromAddress) + ">",
-                    ]
-                )
-            )
-
-        # If the previous message was to a chan then we should send our reply to
-        # the chan rather than to the particular person who sent the message.
+            self.ui.lineEditTo.setText(tableWidget.item(currentInboxRow, 1).label + " <" + str(acct.fromAddress) + ">")
+        
+        # If the previous message was to a chan then we should send our reply to the chan rather than to the particular person who sent the message.
         if acct.type == AccountMixin.CHAN and replyType == self.REPLY_TYPE_CHAN:
             logger.debug('original sent to a chan. Setting the to address in the reply to the chan address.')
             if toAddressAtCurrentInboxRow == tableWidget.item(currentInboxRow, 0).label:
                 self.ui.lineEditTo.setText(str(toAddressAtCurrentInboxRow))
             else:
-                self.ui.lineEditTo.setText(tableWidget.item(
-                    currentInboxRow, 0).label + " <" + str(acct.toAddress) + ">")
-
+                self.ui.lineEditTo.setText(tableWidget.item(currentInboxRow, 0).label + " <" + str(acct.toAddress) + ">")
+        
         self.setSendFromComboBox(toAddressAtCurrentInboxRow)
-
+        
         quotedText = self.quoted_text(unicode(messageAtCurrentInboxRow, 'utf-8', 'replace'))
         widget['message'].setPlainText(quotedText)
         if acct.subject[0:3] in ['Re:', 'RE:']:
@@ -3551,8 +3060,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         widget['message'].setFocus()
 
     def on_action_InboxAddSenderToAddressBook(self):
-        """TBC"""
-
         tableWidget = self.getCurrentMessagelist()
         if not tableWidget:
             return
@@ -3567,8 +3074,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             dialogs.AddAddressDialog(self, addressAtCurrentInboxRow))
 
     def on_action_InboxAddSenderToBlackList(self):
-        """TBC"""
-
         tableWidget = self.getCurrentMessagelist()
         if not tableWidget:
             return
@@ -3582,37 +3087,25 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         queryreturn = sqlQuery('''select * from blacklist where address=?''',
                                addressAtCurrentInboxRow)
         if queryreturn == []:
-            label = "\"" + tableWidget.item(currentInboxRow,
-                                            2).subject + "\" in " + BMConfigParser().get(recipientAddress,
-                                                                                         "label")
+            label = "\"" + tableWidget.item(currentInboxRow, 2).subject + "\" in " + BMConfigParser().get(recipientAddress, "label")
             sqlExecute('''INSERT INTO blacklist VALUES (?,?, ?)''',
                        label,
                        addressAtCurrentInboxRow, True)
             self.ui.blackwhitelist.rerenderBlackWhiteList()
-            self.updateStatusBar(
-                _translate(
-                    "MainWindow",
-                    "Entry added to the blacklist. Edit the label to your liking."
-                )
+            self.updateStatusBar(_translate(
+                "MainWindow",
+                "Entry added to the blacklist. Edit the label to your liking.")
             )
         else:
-            self.updateStatusBar(
-                _translate(
-                    "MainWindow",
-                    ("Error: You cannot add the same address to your blacklist"
-                     " twice. Try renaming the existing one if you want.")
-                )
-            )
-
-    def deleteRowFromMessagelist(self, row=None, inventoryHash=None, ackData=None, messageLists=None):
-        """TBC"""
+            self.updateStatusBar(_translate(
+                "MainWindow",
+                "Error: You cannot add the same address to your blacklist"
+                " twice. Try renaming the existing one if you want."))
 
+    def deleteRowFromMessagelist(self, row = None, inventoryHash = None, ackData = None, messageLists = None):
         if messageLists is None:
-            messageLists = (
-                self.ui.tableWidgetInbox,
-                self.ui.tableWidgetInboxChans,
-                self.ui.tableWidgetInboxSubscriptions)
-        elif not isinstance(messageLists, (list, tuple)):
+            messageLists = (self.ui.tableWidgetInbox, self.ui.tableWidgetInboxChans, self.ui.tableWidgetInboxSubscriptions)
+        elif type(messageLists) not in (list, tuple):
             messageLists = (messageLists)
         for messageList in messageLists:
             if row is not None:
@@ -3628,35 +3121,34 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     if messageList.item(i, 3).data(QtCore.Qt.UserRole).toPyObject() == ackData:
                         messageList.removeRow(i)
 
+    # Send item on the Inbox tab to trash
     def on_action_InboxTrash(self):
-        """Send item on the Inbox tab to trash"""
-
         tableWidget = self.getCurrentMessagelist()
         if not tableWidget:
             return
         currentRow = 0
         folder = self.getCurrentFolder()
         shifted = QtGui.QApplication.queryKeyboardModifiers() & QtCore.Qt.ShiftModifier
-        tableWidget.setUpdatesEnabled(False)
+        tableWidget.setUpdatesEnabled(False);
         inventoryHashesToTrash = []
         # ranges in reversed order
         for r in sorted(tableWidget.selectedRanges(), key=lambda r: r.topRow())[::-1]:
-            for i in range(r.bottomRow() - r.topRow() + 1):
+            for i in range(r.bottomRow()-r.topRow()+1):
                 inventoryHashToTrash = str(tableWidget.item(
-                    r.topRow() + i, 3).data(QtCore.Qt.UserRole).toPyObject())
+                    r.topRow()+i, 3).data(QtCore.Qt.UserRole).toPyObject())
                 if inventoryHashToTrash in inventoryHashesToTrash:
                     continue
                 inventoryHashesToTrash.append(inventoryHashToTrash)
             currentRow = r.topRow()
             self.getCurrentMessageTextedit().setText("")
-            tableWidget.model().removeRows(r.topRow(), r.bottomRow() - r.topRow() + 1)
+            tableWidget.model().removeRows(r.topRow(), r.bottomRow()-r.topRow()+1)
         idCount = len(inventoryHashesToTrash)
         if folder == "trash" or shifted:
             sqlExecuteChunked('''DELETE FROM inbox WHERE msgid IN ({0})''',
-                              idCount, *inventoryHashesToTrash)
+                    idCount, *inventoryHashesToTrash)
         else:
             sqlExecuteChunked('''UPDATE inbox SET folder='trash' WHERE msgid IN ({0})''',
-                              idCount, *inventoryHashesToTrash)
+                    idCount, *inventoryHashesToTrash)
         tableWidget.selectRow(0 if currentRow == 0 else currentRow - 1)
         tableWidget.setUpdatesEnabled(True)
         self.propagateUnreadCount(self.getCurrentAccount, folder)
@@ -3664,8 +3156,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             "MainWindow", "Moved items to trash."))
 
     def on_action_TrashUndelete(self):
-        """TBC"""
-
         tableWidget = self.getCurrentMessagelist()
         if not tableWidget:
             return
@@ -3674,30 +3164,28 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         inventoryHashesToTrash = []
         # ranges in reversed order
         for r in sorted(tableWidget.selectedRanges(), key=lambda r: r.topRow())[::-1]:
-            for i in range(r.bottomRow() - r.topRow() + 1):
+            for i in range(r.bottomRow()-r.topRow()+1):
                 inventoryHashToTrash = str(tableWidget.item(
-                    r.topRow() + i, 3).data(QtCore.Qt.UserRole).toPyObject())
+                    r.topRow()+i, 3).data(QtCore.Qt.UserRole).toPyObject())
                 if inventoryHashToTrash in inventoryHashesToTrash:
                     continue
                 inventoryHashesToTrash.append(inventoryHashToTrash)
             currentRow = r.topRow()
             self.getCurrentMessageTextedit().setText("")
-            tableWidget.model().removeRows(r.topRow(), r.bottomRow() - r.topRow() + 1)
+            tableWidget.model().removeRows(r.topRow(), r.bottomRow()-r.topRow()+1)
         if currentRow == 0:
             tableWidget.selectRow(currentRow)
         else:
             tableWidget.selectRow(currentRow - 1)
         idCount = len(inventoryHashesToTrash)
         sqlExecuteChunked('''UPDATE inbox SET folder='inbox' WHERE msgid IN({0})''',
-                          idCount, *inventoryHashesToTrash)
+                idCount, *inventoryHashesToTrash)
         tableWidget.selectRow(0 if currentRow == 0 else currentRow - 1)
         tableWidget.setUpdatesEnabled(True)
         self.propagateUnreadCount(self.getCurrentAccount)
         self.updateStatusBar(_translate("MainWindow", "Undeleted item."))
 
     def on_action_InboxSaveMessageAs(self):
-        """TBC"""
-
         tableWidget = self.getCurrentMessagelist()
         if not tableWidget:
             return
@@ -3718,9 +3206,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 message, = row
 
         defaultFilename = "".join(x for x in subjectAtCurrentInboxRow if x.isalnum()) + '.txt'
-        filename = QtGui.QFileDialog.getSaveFileName(
-            self, _translate("MainWindow", "Save As..."),
-            defaultFilename, "Text files (*.txt);;All files (*.*)")
+        filename = QtGui.QFileDialog.getSaveFileName(self, _translate("MainWindow","Save As..."), defaultFilename, "Text files (*.txt);;All files (*.*)")
         if filename == '':
             return
         try:
@@ -3731,10 +3217,10 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             logger.exception('Message not saved', exc_info=True)
             self.updateStatusBar(_translate("MainWindow", "Write error."))
 
+    # Send item on the Sent tab to trash
     def on_action_SentTrash(self):
-        """Send item on the Sent tab to trash"""
-
         currentRow = 0
+        unread = False
         tableWidget = self.getCurrentMessagelist()
         if not tableWidget:
             return
@@ -3749,15 +3235,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             else:
                 sqlExecute('''UPDATE sent SET folder='trash' WHERE ackdata=?''', ackdataToTrash)
             if tableWidget.item(currentRow, 0).unread:
-                self.propagateUnreadCount(
-                    tableWidget.item(
-                        currentRow,
-                        1 if tableWidget.item(currentRow, 1).type == AccountMixin.SUBSCRIPTION else 0
-                    ).data(QtCore.Qt.UserRole),
-                    folder,
-                    self.getCurrentTreeWidget(),
-                    -1,
-                )
+                self.propagateUnreadCount(tableWidget.item(currentRow, 1 if tableWidget.item(currentRow, 1).type == AccountMixin.SUBSCRIPTION else 0).data(QtCore.Qt.UserRole), folder, self.getCurrentTreeWidget(), -1)
             self.getCurrentMessageTextedit().setPlainText("")
             tableWidget.removeRow(currentRow)
             self.updateStatusBar(_translate(
@@ -3767,8 +3245,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             currentRow if currentRow == 0 else currentRow - 1)
 
     def on_action_ForceSend(self):
-        """TBC"""
-
         currentRow = self.ui.tableWidgetInbox.currentRow()
         addressAtCurrentRow = self.ui.tableWidgetInbox.item(
             currentRow, 0).data(QtCore.Qt.UserRole)
@@ -3784,22 +3260,17 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         queues.workerQueue.put(('sendmessage', ''))
 
     def on_action_SentClipboard(self):
-        """TBC"""
-
         currentRow = self.ui.tableWidgetInbox.currentRow()
         addressAtCurrentRow = self.ui.tableWidgetInbox.item(
             currentRow, 0).data(QtCore.Qt.UserRole)
         clipboard = QtGui.QApplication.clipboard()
         clipboard.setText(str(addressAtCurrentRow))
 
+    # Group of functions for the Address Book dialog box
     def on_action_AddressBookNew(self):
-        """Group of functions for the Address Book dialog box"""
-
         self.click_pushButtonAddAddressBook()
 
     def on_action_AddressBookDelete(self):
-        """TBC"""
-
         while self.ui.tableWidgetAddressBook.selectedIndexes() != []:
             currentRow = self.ui.tableWidgetAddressBook.selectedIndexes()[
                 0].row()
@@ -3814,8 +3285,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.rerenderMessagelistToLabels()
 
     def on_action_AddressBookClipboard(self):
-        """TBC"""
-
         fullStringOfAddresses = ''
         listOfSelectedRows = {}
         for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())):
@@ -3832,8 +3301,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         clipboard.setText(fullStringOfAddresses)
 
     def on_action_AddressBookSend(self):
-        """TBC"""
-
         listOfSelectedRows = {}
         for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())):
             listOfSelectedRows[
@@ -3859,13 +3326,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             )
 
     def on_action_AddressBookSubscribe(self):
-        """TBC"""
-
         listOfSelectedRows = {}
         for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())):
             listOfSelectedRows[self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0
         for currentRow in listOfSelectedRows:
-            addressAtCurrentRow = str(self.ui.tableWidgetAddressBook.item(currentRow, 1).text())
+            addressAtCurrentRow = str(self.ui.tableWidgetAddressBook.item(currentRow,1).text())
             # Then subscribe to it... provided it's not already in the address book
             if shared.isAddressInMySubscriptionsList(addressAtCurrentRow):
                 self.updateStatusBar(_translate(
@@ -3874,15 +3339,13 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                     " subscriptions twice. Perhaps rename the existing"
                     " one if you want."))
                 continue
-            labelAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow, 0).text().toUtf8()
+            labelAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,0).text().toUtf8()
             self.addSubscription(addressAtCurrentRow, labelAtCurrentRow)
             self.ui.tabWidget.setCurrentIndex(
                 self.ui.tabWidget.indexOf(self.ui.subscriptions)
             )
 
     def on_context_menuAddressBook(self, point):
-        """TBC"""
-
         self.popMenuAddressBook = QtGui.QMenu(self)
         self.popMenuAddressBook.addAction(self.actionAddressBookSend)
         self.popMenuAddressBook.addAction(self.actionAddressBookClipboard)
@@ -3894,9 +3357,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         normal = True
         for row in self.ui.tableWidgetAddressBook.selectedIndexes():
             currentRow = row.row()
-            row_type = self.ui.tableWidgetAddressBook.item(
+            type = self.ui.tableWidgetAddressBook.item(
                 currentRow, 0).type
-            if row_type != AccountMixin.NORMAL:
+            if type != AccountMixin.NORMAL:
                 normal = False
         if normal:
             # only if all selected addressbook items are normal, allow delete
@@ -3904,14 +3367,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.popMenuAddressBook.exec_(
             self.ui.tableWidgetAddressBook.mapToGlobal(point))
 
+    # Group of functions for the Subscriptions dialog box
     def on_action_SubscriptionsNew(self):
-        """Group of functions for the Subscriptions dialog box"""
-
         self.click_pushButtonAddSubscription()
 
     def on_action_SubscriptionsDelete(self):
-        """TBC"""
-
         if QtGui.QMessageBox.question(
                 self, "Delete subscription?",
                 _translate(
@@ -3935,15 +3395,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         shared.reloadBroadcastSendersForWhichImWatching()
 
     def on_action_SubscriptionsClipboard(self):
-        """TBC"""
-
         address = self.getCurrentAccount()
         clipboard = QtGui.QApplication.clipboard()
         clipboard.setText(str(address))
 
     def on_action_SubscriptionsEnable(self):
-        """TBC"""
-
         address = self.getCurrentAccount()
         sqlExecute(
             '''update subscriptions set enabled=1 WHERE address=?''',
@@ -3954,8 +3410,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         shared.reloadBroadcastSendersForWhichImWatching()
 
     def on_action_SubscriptionsDisable(self):
-        """TBC"""
-
         address = self.getCurrentAccount()
         sqlExecute(
             '''update subscriptions set enabled=0 WHERE address=?''',
@@ -3966,8 +3420,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         shared.reloadBroadcastSendersForWhichImWatching()
 
     def on_context_menuSubscriptions(self, point):
-        """TBC"""
-
         currentItem = self.getCurrentItem()
         self.popMenuSubscriptions = QtGui.QMenu(self)
         if isinstance(currentItem, Ui_AddressWidget):
@@ -3990,9 +3442,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.popMenuSubscriptions.exec_(
             self.ui.treeWidgetSubscriptions.mapToGlobal(point))
 
-    def widgetConvert(self, widget):  # pylint: disable=inconsistent-return-statements
-        """TBC"""
-
+    def widgetConvert (self, widget):
         if widget == self.ui.tableWidgetInbox:
             return self.ui.treeWidgetYourIdentities
         elif widget == self.ui.tableWidgetInboxSubscriptions:
@@ -4005,35 +3455,35 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             return self.ui.tableWidgetInboxSubscriptions
         elif widget == self.ui.treeWidgetChans:
             return self.ui.tableWidgetInboxChans
+        else:
+            return None
 
     def getCurrentTreeWidget(self):
-        """TBC"""
-
-        currentIndex = self.ui.tabWidget.currentIndex()
+        currentIndex = self.ui.tabWidget.currentIndex();
         treeWidgetList = [
             self.ui.treeWidgetYourIdentities,
             False,
             self.ui.treeWidgetSubscriptions,
             self.ui.treeWidgetChans
         ]
-        return treeWidgetList[currentIndex] if currentIndex >= 0 and currentIndex < len(treeWidgetList) else False
+        if currentIndex >= 0 and currentIndex < len(treeWidgetList):
+            return treeWidgetList[currentIndex]
+        else:
+            return False
 
     def getAccountTreeWidget(self, account):
-        """TBC"""
-
         try:
             if account.type == AccountMixin.CHAN:
                 return self.ui.treeWidgetChans
             elif account.type == AccountMixin.SUBSCRIPTION:
                 return self.ui.treeWidgetSubscriptions
-            return self.ui.treeWidgetYourIdentities
+            else:
+                return self.ui.treeWidgetYourIdentities
         except:
             return self.ui.treeWidgetYourIdentities
 
     def getCurrentMessagelist(self):
-        """TBC"""
-
-        currentIndex = self.ui.tabWidget.currentIndex()
+        currentIndex = self.ui.tabWidget.currentIndex();
         messagelistList = [
             self.ui.tableWidgetInbox,
             False,
@@ -4042,23 +3492,21 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         ]
         if currentIndex >= 0 and currentIndex < len(messagelistList):
             return messagelistList[currentIndex]
-        return False
-
+        else:
+            return False
+            
     def getAccountMessagelist(self, account):
-        """TBC"""
-
         try:
             if account.type == AccountMixin.CHAN:
                 return self.ui.tableWidgetInboxChans
             elif account.type == AccountMixin.SUBSCRIPTION:
                 return self.ui.tableWidgetInboxSubscriptions
-            return self.ui.tableWidgetInbox
+            else:
+                return self.ui.tableWidgetInbox
         except:
             return self.ui.tableWidgetInbox
 
     def getCurrentMessageId(self):
-        """TBC"""
-
         messagelist = self.getCurrentMessagelist()
         if messagelist:
             currentRow = messagelist.currentRow()
@@ -4070,8 +3518,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         return False
 
     def getCurrentMessageTextedit(self):
-        """TBC"""
-
         currentIndex = self.ui.tabWidget.currentIndex()
         messagelistList = [
             self.ui.textEditInboxMessage,
@@ -4081,41 +3527,38 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         ]
         if currentIndex >= 0 and currentIndex < len(messagelistList):
             return messagelistList[currentIndex]
-        return False
+        else:
+            return False
 
     def getAccountTextedit(self, account):
-        """TBC"""
-
         try:
             if account.type == AccountMixin.CHAN:
                 return self.ui.textEditInboxMessageChans
             elif account.type == AccountMixin.SUBSCRIPTION:
                 return self.ui.textEditInboxSubscriptions
-            return self.ui.textEditInboxMessage
+            else:
+                return self.ui.textEditInboxMessage
         except:
             return self.ui.textEditInboxMessage
 
-    def getCurrentSearchLine(self, currentIndex=None, retObj=False):  # pylint: disable=inconsistent-return-statements
-        """TBC"""
-
+    def getCurrentSearchLine(self, currentIndex=None, retObj=False):
         if currentIndex is None:
             currentIndex = self.ui.tabWidget.currentIndex()
-
         messagelistList = [
             self.ui.inboxSearchLineEdit,
             False,
             self.ui.inboxSearchLineEditSubscriptions,
             self.ui.inboxSearchLineEditChans,
         ]
-
         if currentIndex >= 0 and currentIndex < len(messagelistList):
             if retObj:
                 return messagelistList[currentIndex]
-            return messagelistList[currentIndex].text().toUtf8().data()
-
-    def getCurrentSearchOption(self, currentIndex=None):  # pylint: disable=inconsistent-return-statements
-        """TBC"""
+            else:
+                return messagelistList[currentIndex].text().toUtf8().data()
+        else:
+            return None
 
+    def getCurrentSearchOption(self, currentIndex=None):
         if currentIndex is None:
             currentIndex = self.ui.tabWidget.currentIndex()
         messagelistList = [
@@ -4126,10 +3569,11 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         ]
         if currentIndex >= 0 and currentIndex < len(messagelistList):
             return messagelistList[currentIndex].currentText().toUtf8().data()
+        else:
+            return None
 
+    # Group of functions for the Your Identities dialog box
     def getCurrentItem(self, treeWidget=None):
-        """Group of functions for the Your Identities dialog box"""
-
         if treeWidget is None:
             treeWidget = self.getCurrentTreeWidget()
         if treeWidget:
@@ -4137,29 +3581,28 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             if currentItem:
                 return currentItem
         return False
-
+    
     def getCurrentAccount(self, treeWidget=None):
-        """TODO: debug msg in else?"""
-
         currentItem = self.getCurrentItem(treeWidget)
         if currentItem:
             account = currentItem.address
             return account
-        return False
-
-    def getCurrentFolder(self, treeWidget=None):  # pylint: disable=inconsistent-return-statements
-        """TBC"""
+        else:
+            # TODO need debug msg?
+            return False
 
+    def getCurrentFolder(self, treeWidget=None):
         if treeWidget is None:
             treeWidget = self.getCurrentTreeWidget()
+        #treeWidget = self.ui.treeWidgetYourIdentities
         if treeWidget:
             currentItem = treeWidget.currentItem()
             if currentItem and hasattr(currentItem, 'folderName'):
                 return currentItem.folderName
+            else:
+                return None
 
     def setCurrentItemColor(self, color):
-        """TBC"""
-
         treeWidget = self.getCurrentTreeWidget()
         if treeWidget:
             brush = QtGui.QBrush()
@@ -4169,13 +3612,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             currentItem.setForeground(0, brush)
 
     def on_action_YourIdentitiesNew(self):
-        """TBC"""
-
         self.click_NewAddressDialog()
 
     def on_action_YourIdentitiesDelete(self):
-        """TBC"""
-
         account = self.getCurrentItem()
         if account.type == AccountMixin.NORMAL:
             return  # maybe in the future
@@ -4208,52 +3647,39 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.rerenderTabTreeChans()
 
     def on_action_Enable(self):
-        """TBC"""
-
         addressAtCurrentRow = self.getCurrentAccount()
         self.enableIdentity(addressAtCurrentRow)
         account = self.getCurrentItem()
         account.setEnabled(True)
 
     def enableIdentity(self, address):
-        """TBC"""
-
         BMConfigParser().set(address, 'enabled', 'true')
         BMConfigParser().save()
         shared.reloadMyAddressHashes()
         self.rerenderAddressBook()
 
     def on_action_Disable(self):
-        """TBC"""
-
         address = self.getCurrentAccount()
         self.disableIdentity(address)
         account = self.getCurrentItem()
         account.setEnabled(False)
 
     def disableIdentity(self, address):
-        """TBC"""
-
         BMConfigParser().set(str(address), 'enabled', 'false')
         BMConfigParser().save()
         shared.reloadMyAddressHashes()
         self.rerenderAddressBook()
 
     def on_action_Clipboard(self):
-        """TBC"""
-
         address = self.getCurrentAccount()
         clipboard = QtGui.QApplication.clipboard()
         clipboard.setText(str(address))
 
     def on_action_ClipboardMessagelist(self):
-        """TBC"""
-        # pylint: disable=too-many-boolean-expressions
-
         tableWidget = self.getCurrentMessagelist()
         currentColumn = tableWidget.currentColumn()
         currentRow = tableWidget.currentRow()
-        if currentColumn not in [0, 1, 2]:  # to, from, subject
+        if currentColumn not in [0, 1, 2]: # to, from, subject
             if self.getCurrentFolder() == "sent":
                 currentColumn = 0
             else:
@@ -4265,14 +3691,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             myAddress = tableWidget.item(currentRow, 0).data(QtCore.Qt.UserRole)
             otherAddress = tableWidget.item(currentRow, 1).data(QtCore.Qt.UserRole)
         account = accountClass(myAddress)
-        if (
-                isinstance(account, GatewayAccount) and
-                otherAddress == account.relayAddress and (
-                    currentColumn in [0, 2] and self.getCurrentFolder() == "sent" or
-                    currentColumn in [1, 2] and self.getCurrentFolder() != "sent"
-                )
-        ):
-
+        if isinstance(account, GatewayAccount) and otherAddress == account.relayAddress and (
+            (currentColumn in [0, 2] and self.getCurrentFolder() == "sent") or
+            (currentColumn in [1, 2] and self.getCurrentFolder() != "sent")):
             text = str(tableWidget.item(currentRow, currentColumn).label)
         else:
             text = tableWidget.item(currentRow, currentColumn).data(QtCore.Qt.UserRole)
@@ -4280,20 +3701,15 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         clipboard = QtGui.QApplication.clipboard()
         clipboard.setText(text)
 
+    #set avatar functions
     def on_action_TreeWidgetSetAvatar(self):
-        """set avatar functions"""
-
         address = self.getCurrentAccount()
         self.setAvatar(address)
 
     def on_action_AddressBookSetAvatar(self):
-        """TBC"""
-
         self.on_action_SetAvatar(self.ui.tableWidgetAddressBook)
-
+        
     def on_action_SetAvatar(self, thisTableWidget):
-        """TBC"""
-
         currentRow = thisTableWidget.currentRow()
         addressAtCurrentRow = thisTableWidget.item(
             currentRow, 1).text()
@@ -4303,50 +3719,20 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 currentRow, 0).setIcon(avatarize(addressAtCurrentRow))
 
     def setAvatar(self, addressAtCurrentRow):
-        """TBC"""
-
         if not os.path.exists(state.appdata + 'avatars/'):
             os.makedirs(state.appdata + 'avatars/')
-        addressHash = hashlib.md5(addBMIfNotPresent(addressAtCurrentRow)).hexdigest()
-        extensions = [
-            'PNG',
-            'GIF',
-            'JPG',
-            'JPEG',
-            'SVG',
-            'BMP',
-            'MNG',
-            'PBM',
-            'PGM',
-            'PPM',
-            'TIFF',
-            'XBM',
-            'XPM',
-            'TGA']
+        hash = hashlib.md5(addBMIfNotPresent(addressAtCurrentRow)).hexdigest()
+        extensions = ['PNG', 'GIF', 'JPG', 'JPEG', 'SVG', 'BMP', 'MNG', 'PBM', 'PGM', 'PPM', 'TIFF', 'XBM', 'XPM', 'TGA']
         # http://pyqt.sourceforge.net/Docs/PyQt4/qimagereader.html#supportedImageFormats
-        names = {
-            'BMP': 'Windows Bitmap',
-            'GIF': 'Graphic Interchange Format',
-            'JPG': 'Joint Photographic Experts Group',
-            'JPEG': 'Joint Photographic Experts Group',
-            'MNG': 'Multiple-image Network Graphics',
-            'PNG': 'Portable Network Graphics',
-            'PBM': 'Portable Bitmap',
-            'PGM': 'Portable Graymap',
-            'PPM': 'Portable Pixmap',
-            'TIFF': 'Tagged Image File Format',
-            'XBM': 'X11 Bitmap',
-            'XPM': 'X11 Pixmap',
-            'SVG': 'Scalable Vector Graphics',
-            'TGA': 'Targa Image Format'}
+        names = {'BMP':'Windows Bitmap', 'GIF':'Graphic Interchange Format', 'JPG':'Joint Photographic Experts Group', 'JPEG':'Joint Photographic Experts Group', 'MNG':'Multiple-image Network Graphics', 'PNG':'Portable Network Graphics', 'PBM':'Portable Bitmap', 'PGM':'Portable Graymap', 'PPM':'Portable Pixmap', 'TIFF':'Tagged Image File Format', 'XBM':'X11 Bitmap', 'XPM':'X11 Pixmap', 'SVG':'Scalable Vector Graphics', 'TGA':'Targa Image Format'}
         filters = []
         all_images_filter = []
         current_files = []
         for ext in extensions:
-            filters += [names[ext] + ' (*.' + ext.lower() + ')']
-            all_images_filter += ['*.' + ext.lower()]
-            upper = state.appdata + 'avatars/' + addressHash + '.' + ext.upper()
-            lower = state.appdata + 'avatars/' + addressHash + '.' + ext.lower()
+            filters += [ names[ext] + ' (*.' + ext.lower() + ')' ]
+            all_images_filter += [ '*.' + ext.lower() ]
+            upper = state.appdata + 'avatars/' + hash + '.' + ext.upper()
+            lower = state.appdata + 'avatars/' + hash + '.' + ext.lower()
             if os.path.isfile(lower):
                 current_files += [lower]
             elif os.path.isfile(upper):
@@ -4355,35 +3741,33 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         filters[1:1] = ['All files (*.*)']
         sourcefile = QtGui.QFileDialog.getOpenFileName(
             self, _translate("MainWindow", "Set avatar..."),
-            filter=';;'.join(filters)
+            filter = ';;'.join(filters)
         )
         # determine the correct filename (note that avatars don't use the suffix)
-        destination = state.appdata + 'avatars/' + addressHash + '.' + sourcefile.split('.')[-1]
+        destination = state.appdata + 'avatars/' + hash + '.' + sourcefile.split('.')[-1]
         exists = QtCore.QFile.exists(destination)
         if sourcefile == '':
             # ask for removal of avatar
-            if exists | current_files:
+            if exists | (len(current_files)>0):
                 displayMsg = _translate("MainWindow", "Do you really want to remove this avatar?")
                 overwrite = QtGui.QMessageBox.question(
-                    self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+                            self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
             else:
                 overwrite = QtGui.QMessageBox.No
         else:
             # ask whether to overwrite old avatar
-            if exists | current_files:
-                displayMsg = _translate(
-                    "MainWindow",
-                    "You have already set an avatar for this address. Do you really want to overwrite it?")
+            if exists | (len(current_files)>0):
+                displayMsg = _translate("MainWindow", "You have already set an avatar for this address. Do you really want to overwrite it?")
                 overwrite = QtGui.QMessageBox.question(
-                    self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+                            self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
             else:
                 overwrite = QtGui.QMessageBox.No
-
+            
         # copy the image file to the appdata folder
-        if not exists | overwrite == QtGui.QMessageBox.Yes:
+        if (not exists) | (overwrite == QtGui.QMessageBox.Yes):
             if overwrite == QtGui.QMessageBox.Yes:
-                for file_name in current_files:
-                    QtCore.QFile.remove(file_name)
+                for file in current_files:
+                    QtCore.QFile.remove(file)
                 QtCore.QFile.remove(destination)
             # copy it
             if sourcefile != '':
@@ -4405,14 +3789,10 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         return True
 
     def on_action_AddressBookSetSound(self):
-        """TBC"""
-
         widget = self.ui.tableWidgetAddressBook
         self.setAddressSound(widget.item(widget.currentRow(), 0).text())
 
     def setAddressSound(self, addr):
-        """TBC"""
-
         filters = [unicode(_translate(
             "MainWindow", "Sound files (%s)" %
             ' '.join(['*%s%s' % (os.extsep, ext) for ext in sound.extensions])
@@ -4453,8 +3833,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 'couldn\'t copy %s to %s', sourcefile, destination)
 
     def on_context_menuYourIdentities(self, point):
-        """TBC"""
-
         currentItem = self.getCurrentItem()
         self.popMenuYourIdentities = QtGui.QMenu(self)
         if isinstance(currentItem, Ui_AddressWidget):
@@ -4480,9 +3858,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.popMenuYourIdentities.exec_(
             self.ui.treeWidgetYourIdentities.mapToGlobal(point))
 
+    # TODO make one popMenu
     def on_context_menuChan(self, point):
-        """TODO: make one popMenu"""
-
         currentItem = self.getCurrentItem()
         self.popMenu = QtGui.QMenu(self)
         if isinstance(currentItem, Ui_AddressWidget):
@@ -4506,8 +3883,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.ui.treeWidgetChans.mapToGlobal(point))
 
     def on_context_menuInbox(self, point):
-        """TBC"""
-
         tableWidget = self.getCurrentMessagelist()
         if tableWidget:
             currentFolder = self.getCurrentFolder()
@@ -4528,9 +3903,9 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 self.popMenuInbox.addAction(self.actionReply)
                 self.popMenuInbox.addAction(self.actionAddSenderToAddressBook)
                 self.actionClipboardMessagelist = self.ui.inboxContextMenuToolbar.addAction(
-                    _translate(
-                        "MainWindow", "Copy subject to clipboard"
-                        if tableWidget.currentColumn() == 2 else "Copy address to clipboard"),
+                    _translate("MainWindow",
+                        "Copy subject to clipboard" if tableWidget.currentColumn() == 2 else "Copy address to clipboard"
+                    ),
                     self.on_action_ClipboardMessagelist)
                 self.popMenuInbox.addAction(self.actionClipboardMessagelist)
                 self.popMenuInbox.addSeparator()
@@ -4544,8 +3919,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
                 self.popMenuInbox.exec_(tableWidget.mapToGlobal(point))
 
     def on_context_menuSent(self, point):
-        """TBC"""
-
         self.popMenuSent = QtGui.QMenu(self)
         self.popMenuSent.addAction(self.actionSentClipboard)
         self.popMenuSent.addAction(self.actionTrashSentMessage)
@@ -4565,8 +3938,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.popMenuSent.exec_(self.ui.tableWidgetInbox.mapToGlobal(point))
 
     def inboxSearchLineEditUpdated(self, text):
-        """TBC"""
-
         # dynamic search for too short text is slow
         if len(str(text)) < 3:
             return
@@ -4578,8 +3949,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.loadMessagelist(messagelist, account, folder, searchOption, str(text))
 
     def inboxSearchLineEditReturnPressed(self):
-        """TBC"""
-
         logger.debug("Search return pressed")
         searchLine = self.getCurrentSearchLine()
         messagelist = self.getCurrentMessagelist()
@@ -4592,8 +3961,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             messagelist.setFocus()
 
     def treeWidgetItemClicked(self):
-        """TBC"""
-
         searchLine = self.getCurrentSearchLine()
         searchOption = self.getCurrentSearchOption()
         messageTextedit = self.getCurrentMessageTextedit()
@@ -4609,21 +3976,14 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.loadMessagelist(messagelist, account, folder, searchOption, searchLine)
 
     def treeWidgetItemChanged(self, item, column):
-        """TBC"""
-
         # only for manual edits. automatic edits (setText) are ignored
         if column != 0:
             return
         # only account names of normal addresses (no chans/mailinglists)
-        if (
-                not isinstance(item, Ui_AddressWidget) or
-                not self.getCurrentTreeWidget() or
-                self.getCurrentTreeWidget().currentItem() is None
-        ):
+        if (not isinstance(item, Ui_AddressWidget)) or (not self.getCurrentTreeWidget()) or self.getCurrentTreeWidget().currentItem() is None:
             return
-
         # not visible
-        if (not self.getCurrentItem()) or (not isinstance(self.getCurrentItem(), Ui_AddressWidget)):
+        if (not self.getCurrentItem()) or (not isinstance (self.getCurrentItem(), Ui_AddressWidget)):
             return
         # only currently selected item
         if item.address != self.getCurrentAccount():
@@ -4631,7 +3991,7 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         # "All accounts" can't be renamed
         if item.type == AccountMixin.ALL:
             return
-
+        
         newLabel = unicode(item.text(0), 'utf-8', 'ignore')
         oldLabel = item.defaultLabel()
 
@@ -4656,8 +4016,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.recurDepth -= 1
 
     def tableWidgetInboxItemClicked(self):
-        """TBC"""
-
         folder = self.getCurrentFolder()
         messageTextedit = self.getCurrentMessageTextedit()
         if not messageTextedit:
@@ -4688,10 +4046,10 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             if tableWidget.item(currentRow, 0).unread is True:
                 self.updateUnreadStatus(tableWidget, currentRow, msgid)
             # propagate
-            if (
-                    folder != 'sent' and
-                    sqlExecute('''UPDATE inbox SET read=1 WHERE msgid=? AND read=0''', msgid) > 0
-            ):
+            if folder != 'sent' and sqlExecute(
+                '''UPDATE inbox SET read=1 WHERE msgid=? AND read=0''',
+                msgid
+            ) > 0:
                 self.propagateUnreadCount()
 
         messageTextedit.setCurrentFont(QtGui.QFont())
@@ -4699,29 +4057,23 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         messageTextedit.setContent(message)
 
     def tableWidgetAddressBookItemChanged(self, item):
-        """TBC"""
-
         if item.type == AccountMixin.CHAN:
             self.rerenderComboBoxSendFrom()
         self.rerenderMessagelistFromLabels()
         self.rerenderMessagelistToLabels()
         completerList = self.ui.lineEditTo.completer().model().stringList()
-        for i, this_item in enumerate(completerList):
-            if unicode(this_item).endswith(" <" + item.address + ">"):
-                this_item = item.label + " <" + item.address + ">"
+        for i in range(len(completerList)):
+            if unicode(completerList[i]).endswith(" <" + item.address + ">"):
+                completerList[i] = item.label + " <" + item.address + ">"
         self.ui.lineEditTo.completer().model().setStringList(completerList)
 
     def tabWidgetCurrentChanged(self, n):
-        """TBC"""
-
         if n == self.ui.tabWidget.indexOf(self.ui.networkstatus):
             self.ui.networkstatus.startUpdate()
         else:
             self.ui.networkstatus.stopUpdate()
 
     def writeNewAddressToTable(self, label, address, streamNumber):
-        """TBC"""
-
         self.rerenderTabTreeMessages()
         self.rerenderTabTreeSubscriptions()
         self.rerenderTabTreeChans()
@@ -4730,16 +4082,14 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
         self.rerenderAddressBook()
 
     def updateStatusBar(self, data):
-        """TBC"""
-
-        if isinstance(data, (tuple, list)):
+        if type(data) is tuple or type(data) is list:
             option = data[1]
             message = data[0]
         else:
             option = 0
             message = data
         if message != "":
-            logger.info('Status bar: %s', message)
+            logger.info('Status bar: ' + message)
 
         if option == 1:
             self.statusbar.addImportant(message)
@@ -4747,8 +4097,6 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
             self.statusbar.showMessage(message, 10000)
 
     def initSettings(self):
-        """TBC"""
-
         QtCore.QCoreApplication.setOrganizationName("PyBitmessage")
         QtCore.QCoreApplication.setOrganizationDomain("bitmessage.org")
         QtCore.QCoreApplication.setApplicationName("pybitmessageqt")
@@ -4762,11 +4110,8 @@ class MyForm(settingsmixin.SMainWindow):  # pylint: disable=too-many-public-meth
 
 
 class settingsDialog(QtGui.QDialog):
-    """TBC"""
 
     def __init__(self, parent):
-        """TBC"""
-
         QtGui.QWidget.__init__(self, parent)
         self.ui = Ui_settingsDialog()
         self.ui.setupUi(self)
@@ -4789,7 +4134,7 @@ class settingsDialog(QtGui.QDialog):
             BMConfigParser().safeGetBoolean('bitmessagesettings', 'useidenticons'))
         self.ui.checkBoxReplyBelow.setChecked(
             BMConfigParser().safeGetBoolean('bitmessagesettings', 'replybelow'))
-
+        
         if state.appdata == paths.lookupExeFolder():
             self.ui.checkBoxPortableMode.setChecked(True)
         else:
@@ -4855,36 +4200,16 @@ class settingsDialog(QtGui.QDialog):
             BMConfigParser().get('bitmessagesettings', 'maxoutboundconnections')))
 
         # Demanded difficulty tab
-        self.ui.lineEditTotalDifficulty.setText(
-            str(
-                float(
-                    BMConfigParser().getint('bitmessagesettings', 'defaultnoncetrialsperbyte')
-                ) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte
-            )
-        )
-        self.ui.lineEditSmallMessageDifficulty.setText(
-            str(
-                float(
-                    BMConfigParser().getint('bitmessagesettings', 'defaultpayloadlengthextrabytes')
-                ) / defaults.networkDefaultPayloadLengthExtraBytes
-            )
-        )
+        self.ui.lineEditTotalDifficulty.setText(str((float(BMConfigParser().getint(
+            'bitmessagesettings', 'defaultnoncetrialsperbyte')) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte)))
+        self.ui.lineEditSmallMessageDifficulty.setText(str((float(BMConfigParser().getint(
+            'bitmessagesettings', 'defaultpayloadlengthextrabytes')) / defaults.networkDefaultPayloadLengthExtraBytes)))
 
         # Max acceptable difficulty tab
-        self.ui.lineEditMaxAcceptableTotalDifficulty.setText(
-            str(
-                float(
-                    BMConfigParser().getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte')
-                ) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte
-            )
-        )
-        self.ui.lineEditMaxAcceptableSmallMessageDifficulty.setText(
-            str(
-                float(
-                    BMConfigParser().getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes')
-                ) / defaults.networkDefaultPayloadLengthExtraBytes
-            )
-        )
+        self.ui.lineEditMaxAcceptableTotalDifficulty.setText(str((float(BMConfigParser().getint(
+            'bitmessagesettings', 'maxacceptablenoncetrialsperbyte')) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte)))
+        self.ui.lineEditMaxAcceptableSmallMessageDifficulty.setText(str((float(BMConfigParser().getint(
+            'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes')) / defaults.networkDefaultPayloadLengthExtraBytes)))
 
         # OpenCL
         if openclpow.openclAvailable():
@@ -4929,17 +4254,34 @@ class settingsDialog(QtGui.QDialog):
         QtCore.QObject.connect(self.ui.pushButtonNamecoinTest, QtCore.SIGNAL(
             "clicked()"), self.click_pushButtonNamecoinTest)
 
-        # Message Resend tab
+        #Message Resend tab
         self.ui.lineEditDays.setText(str(
             BMConfigParser().get('bitmessagesettings', 'stopresendingafterxdays')))
         self.ui.lineEditMonths.setText(str(
             BMConfigParser().get('bitmessagesettings', 'stopresendingafterxmonths')))
+        
+        
+        #'System' tab removed for now.
+        """try:
+            maxCores = BMConfigParser().getint('bitmessagesettings', 'maxcores')
+        except:
+            maxCores = 99999
+        if maxCores <= 1:
+            self.ui.comboBoxMaxCores.setCurrentIndex(0)
+        elif maxCores == 2:
+            self.ui.comboBoxMaxCores.setCurrentIndex(1)
+        elif maxCores <= 4:
+            self.ui.comboBoxMaxCores.setCurrentIndex(2)
+        elif maxCores <= 8:
+            self.ui.comboBoxMaxCores.setCurrentIndex(3)
+        elif maxCores <= 16:
+            self.ui.comboBoxMaxCores.setCurrentIndex(4)
+        else:
+            self.ui.comboBoxMaxCores.setCurrentIndex(5)"""
 
         QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
 
     def comboBoxProxyTypeChanged(self, comboBoxIndex):
-        """TBC"""
-
         if comboBoxIndex == 0:
             self.ui.lineEditSocksHostname.setEnabled(False)
             self.ui.lineEditSocksPort.setEnabled(False)
@@ -4956,22 +4298,20 @@ class settingsDialog(QtGui.QDialog):
                 self.ui.lineEditSocksUsername.setEnabled(True)
                 self.ui.lineEditSocksPassword.setEnabled(True)
 
+    # Check status of namecoin integration radio buttons and translate
+    # it to a string as in the options.
     def getNamecoinType(self):
-        """Check status of namecoin integration radio buttons and translate it to a string as in the options."""
-
         if self.ui.radioButtonNamecoinNamecoind.isChecked():
             return "namecoind"
-        elif self.ui.radioButtonNamecoinNmcontrol.isChecked():
+        if self.ui.radioButtonNamecoinNmcontrol.isChecked():
             return "nmcontrol"
-        logger.info("Neither namecoind nor nmcontrol were checked. This is a fatal error")
-        sys.exit(1)
+        assert False
 
+    # Namecoin connection type was changed.
     def namecoinTypeChanged(self, checked):
-        """Namecoin connection type was changed."""
-
         nmctype = self.getNamecoinType()
         assert nmctype == "namecoind" or nmctype == "nmcontrol"
-
+            
         isNamecoind = (nmctype == "namecoind")
         self.ui.lineEditNamecoinUser.setEnabled(isNamecoind)
         self.ui.labelNamecoinUser.setEnabled(isNamecoind)
@@ -4983,11 +4323,10 @@ class settingsDialog(QtGui.QDialog):
         else:
             self.ui.lineEditNamecoinPort.setText("9000")
 
+    # Test the namecoin settings specified in the settings dialog.
     def click_pushButtonNamecoinTest(self):
-        """Test the namecoin settings specified in the settings dialog."""
-
         self.ui.labelNamecoinTestResult.setText(_translate(
-            "MainWindow", "Testing..."))
+                "MainWindow", "Testing..."))
         options = {}
         options["type"] = self.getNamecoinType()
         options["host"] = str(self.ui.lineEditNamecoinHost.text().toUtf8())
@@ -4999,15 +4338,14 @@ class settingsDialog(QtGui.QDialog):
         responseStatus = response[0]
         responseText = response[1]
         self.ui.labelNamecoinTestResult.setText(responseText)
-        if responseStatus == 'success':
+        if responseStatus== 'success':
             self.parent.ui.pushButtonFetchNamecoinID.show()
 
 
+# In order for the time columns on the Inbox and Sent tabs to be sorted
+# correctly (rather than alphabetically), we need to overload the <
+# operator and use this class instead of QTableWidgetItem.
 class myTableWidgetItem(QtGui.QTableWidgetItem):
-    """
-    In order for the time columns on the Inbox and Sent tabs to be sorted correctly (rather than alphabetically),
-    we need to overload the < operator and use this class instead of QTableWidgetItem.
-    """
 
     def __lt__(self, other):
         return int(self.data(33).toPyObject()) < int(other.data(33).toPyObject())
@@ -5030,23 +4368,21 @@ class MySingleApplication(QtGui.QApplication):
     uuid = '6ec0149b-96e1-4be1-93ab-1465fb3ebf7c'
 
     def __init__(self, *argv):
-        """TBC"""
-
         super(MySingleApplication, self).__init__(*argv)
-        _id = MySingleApplication.uuid
+        id = MySingleApplication.uuid
 
         self.server = None
         self.is_running = False
 
         socket = QLocalSocket()
-        socket.connectToServer(_id)
+        socket.connectToServer(id)
         self.is_running = socket.waitForConnected()
 
         # Cleanup past crashed servers
         if not self.is_running:
             if socket.error() == QLocalSocket.ConnectionRefusedError:
                 socket.disconnectFromServer()
-                QLocalServer.removeServer(_id)
+                QLocalServer.removeServer(id)
 
         socket.abort()
 
@@ -5058,44 +4394,34 @@ class MySingleApplication(QtGui.QApplication):
             # Nope, create a local server with this id and assign on_new_connection
             # for whenever a second instance tries to run focus the application.
             self.server = QLocalServer()
-            self.server.listen(_id)
+            self.server.listen(id)
             self.server.newConnection.connect(self.on_new_connection)
 
     def __del__(self):
-        """TBC"""
-
         if self.server:
             self.server.close()
 
     def on_new_connection(self):
-        """TBC"""
-
         if myapp:
             myapp.appIndicatorShow()
 
 
 def init():
-    """TBC"""
-
     global app
-
     if not app:
         app = MySingleApplication(sys.argv)
     return app
 
 
 def run():
-    """Run the gui"""
-
     global myapp
-
-    running_app = init()
+    app = init()
     change_translation(l10n.getTranslationLanguage())
     app.setStyleSheet("QStatusBar::item { border: 0px solid black }")
     myapp = MyForm()
 
     myapp.sqlInit()
-    myapp.appIndicatorInit(running_app)
+    myapp.appIndicatorInit(app)
     myapp.indicatorInit()
     myapp.notifierInit()
     myapp._firstrun = BMConfigParser().safeGetBoolean(
@@ -5104,6 +4430,12 @@ def run():
         myapp.showConnectDialog()  # ask the user if we may connect
     myapp.ui.updateNetworkSwitchMenuLabel()
 
+#    try:
+#        if BMConfigParser().get('bitmessagesettings', 'mailchuck') < 1:
+#            myapp.showMigrationWizard(BMConfigParser().get('bitmessagesettings', 'mailchuck'))
+#    except:
+#        myapp.showMigrationWizard(0)
+    
     # only show after wizards and connect dialogs have completed
     if not BMConfigParser().getboolean('bitmessagesettings', 'startintray'):
         myapp.show()

src/bitmessageqt/account.py

@@ -1,26 +1,58 @@
-from PyQt4 import QtCore, QtGui
+# pylint: disable=too-many-instance-attributes,attribute-defined-outside-init
+"""
+account.py
+==========
 
-import queues
+Account related functions.
+
+"""
+
+from __future__ import absolute_import
+
+import inspect
 import re
 import sys
-import inspect
-from helper_sql import *
-from helper_ackPayload import genAckPayload
-from addresses import decodeAddress
-from bmconfigparser import BMConfigParser
-from foldertree import AccountMixin
-from pyelliptic.openssl import OpenSSL
-from utils import str_broadcast_subscribers
 import time
 
+from PyQt4 import QtGui
+
+import queues
+from addresses import decodeAddress
+from bmconfigparser import BMConfigParser
+from helper_ackPayload import genAckPayload
+from helper_sql import sqlQuery, sqlExecute
+from .foldertree import AccountMixin
+from .utils import str_broadcast_subscribers
+
+
 def getSortedAccounts():
+    """Get a sorted list of configSections"""
+
     configSections = BMConfigParser().addresses()
-    configSections.sort(cmp = 
-        lambda x,y: cmp(unicode(BMConfigParser().get(x, 'label'), 'utf-8').lower(), unicode(BMConfigParser().get(y, 'label'), 'utf-8').lower())
-        )
+    configSections.sort(
+        cmp=lambda x, y: cmp(
+            unicode(
+                BMConfigParser().get(
+                    x,
+                    'label'),
+                'utf-8').lower(),
+            unicode(
+                BMConfigParser().get(
+                    y,
+                    'label'),
+                'utf-8').lower()))
     return configSections
 
-def getSortedSubscriptions(count = False):
+
+def getSortedSubscriptions(count=False):
+    """
+    Actually return a grouped dictionary rather than a sorted list
+
+    :param count: Whether to count messages for each fromaddress in the inbox
+    :type count: bool, default False
+    :retuns: dict keys are addresses, values are dicts containing settings
+    :rtype: dict, default {}
+    """
     queryreturn = sqlQuery('SELECT label, address, enabled FROM subscriptions ORDER BY label COLLATE NOCASE ASC')
     ret = {}
     for row in queryreturn:
@@ -37,7 +69,7 @@ def getSortedSubscriptions(count = False):
             GROUP BY inbox.fromaddress, folder''', str_broadcast_subscribers)
         for row in queryreturn:
             address, folder, cnt = row
-            if not folder in ret[address]:
+            if folder not in ret[address]:
                 ret[address][folder] = {
                     'label': ret[address]['inbox']['label'],
                     'enabled': ret[address]['inbox']['enabled']
@@ -45,9 +77,11 @@ def getSortedSubscriptions(count = False):
             ret[address][folder]['count'] = cnt
     return ret
 
+
 def accountClass(address):
+    """Return a BMAccount for the address"""
     if not BMConfigParser().has_section(address):
-        # FIXME: This BROADCAST section makes no sense
+        # .. todo:: This BROADCAST section makes no sense
         if address == str_broadcast_subscribers:
             subscription = BroadcastAccount(address)
             if subscription.type != AccountMixin.BROADCAST:
@@ -60,8 +94,7 @@ def accountClass(address):
         return subscription
     try:
         gateway = BMConfigParser().get(address, "gateway")
-        for name, cls in inspect.getmembers(sys.modules[__name__], inspect.isclass):
-#            obj = g(address)
+        for _, cls in inspect.getmembers(sys.modules[__name__], inspect.isclass):
             if issubclass(cls, GatewayAccount) and cls.gatewayName == gateway:
                 return cls(address)
         # general gateway
@@ -70,12 +103,15 @@ def accountClass(address):
         pass
     # no gateway
     return BMAccount(address)
-    
-class AccountColor(AccountMixin):
-    def __init__(self, address, type = None):
+
+
+class AccountColor(AccountMixin):  # pylint: disable=too-few-public-methods
+    """Set the type of account"""
+
+    def __init__(self, address, address_type=None):
         self.isEnabled = True
         self.address = address
-        if type is None:
+        if address_type is None:
             if address is None:
                 self.type = AccountMixin.ALL
             elif BMConfigParser().safeGetBoolean(self.address, 'mailinglist'):
@@ -83,16 +119,18 @@ class AccountColor(AccountMixin):
             elif BMConfigParser().safeGetBoolean(self.address, 'chan'):
                 self.type = AccountMixin.CHAN
             elif sqlQuery(
-                '''select label from subscriptions where address=?''', self.address):
+                    '''select label from subscriptions where address=?''', self.address):
                 self.type = AccountMixin.SUBSCRIPTION
             else:
                 self.type = AccountMixin.NORMAL
         else:
-            self.type = type
+            self.type = address_type
+
 
-    
 class BMAccount(object):
-    def __init__(self, address = None):
+    """Encapsulate a Bitmessage account"""
+
+    def __init__(self, address=None):
         self.address = address
         self.type = AccountMixin.NORMAL
         if BMConfigParser().has_section(address):
@@ -108,7 +146,8 @@ class BMAccount(object):
             if queryreturn:
                 self.type = AccountMixin.SUBSCRIPTION
 
-    def getLabel(self, address = None):
+    def getLabel(self, address=None):
+        """Get a label for this bitmessage account"""
         if address is None:
             address = self.address
         label = address
@@ -126,8 +165,10 @@ class BMAccount(object):
                 for row in queryreturn:
                     label, = row
         return label
-        
+
     def parseMessage(self, toAddress, fromAddress, subject, message):
+        """Set metadata and address labels on self"""
+
         self.toAddress = toAddress
         self.fromAddress = fromAddress
         if isinstance(subject, unicode):
@@ -140,36 +181,45 @@ class BMAccount(object):
 
 
 class NoAccount(BMAccount):
-    def __init__(self, address = None):
+    """Override the __init__ method on a BMAccount"""
+
+    def __init__(self, address=None):  # pylint: disable=super-init-not-called
         self.address = address
         self.type = AccountMixin.NORMAL
 
-    def getLabel(self, address = None):
+    def getLabel(self, address=None):
         if address is None:
             address = self.address
         return address
 
-        
+
 class SubscriptionAccount(BMAccount):
+    """Encapsulate a subscription account"""
     pass
-    
+
 
 class BroadcastAccount(BMAccount):
+    """Encapsulate a broadcast account"""
     pass
-        
-        
+
+
 class GatewayAccount(BMAccount):
+    """Encapsulate a gateway account"""
+
     gatewayName = None
     ALL_OK = 0
     REGISTRATION_DENIED = 1
+
     def __init__(self, address):
         super(GatewayAccount, self).__init__(address)
-        
+
     def send(self):
+        """Override the send method for gateway accounts"""
+
+        # pylint: disable=unused-variable
         status, addressVersionNumber, streamNumber, ripe = decodeAddress(self.toAddress)
         stealthLevel = BMConfigParser().safeGetInt('bitmessagesettings', 'ackstealthlevel')
         ackdata = genAckPayload(streamNumber, stealthLevel)
-        t = ()
         sqlExecute(
             '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''',
             '',
@@ -179,47 +229,52 @@ class GatewayAccount(BMAccount):
             self.subject,
             self.message,
             ackdata,
-            int(time.time()), # sentTime (this will never change)
-            int(time.time()), # lastActionTime
-            0, # sleepTill time. This will get set when the POW gets done.
+            int(time.time()),  # sentTime (this will never change)
+            int(time.time()),  # lastActionTime
+            0,  # sleepTill time. This will get set when the POW gets done.
             'msgqueued',
-            0, # retryNumber
-            'sent', # folder
-            2, # encodingtype
-            min(BMConfigParser().getint('bitmessagesettings', 'ttl'), 86400 * 2) # not necessary to have a TTL higher than 2 days
+            0,  # retryNumber
+            'sent',  # folder
+            2,  # encodingtype
+            # not necessary to have a TTL higher than 2 days
+            min(BMConfigParser().getint('bitmessagesettings', 'ttl'), 86400 * 2)
         )
 
         queues.workerQueue.put(('sendmessage', self.toAddress))
-    
-    def parseMessage(self, toAddress, fromAddress, subject, message):
-        super(GatewayAccount, self).parseMessage(toAddress, fromAddress, subject, message)
+
 
 class MailchuckAccount(GatewayAccount):
+    """Encapsulate a particular kind of gateway account"""
+
     # set "gateway" in keys.dat to this
     gatewayName = "mailchuck"
     registrationAddress = "BM-2cVYYrhaY5Gbi3KqrX9Eae2NRNrkfrhCSA"
     unregistrationAddress = "BM-2cVMAHTRjZHCTPMue75XBK5Tco175DtJ9J"
     relayAddress = "BM-2cWim8aZwUNqxzjMxstnUMtVEUQJeezstf"
-    regExpIncoming = re.compile("(.*)MAILCHUCK-FROM::(\S+) \| (.*)")
-    regExpOutgoing = re.compile("(\S+) (.*)")
+    regExpIncoming = re.compile(r"(.*)MAILCHUCK-FROM::(\S+) \| (.*)")
+    regExpOutgoing = re.compile(r"(\S+) (.*)")
+
     def __init__(self, address):
         super(MailchuckAccount, self).__init__(address)
         self.feedback = self.ALL_OK
-        
+
     def createMessage(self, toAddress, fromAddress, subject, message):
+        """createMessage specific to a MailchuckAccount"""
         self.subject = toAddress + " " + subject
         self.toAddress = self.relayAddress
         self.fromAddress = fromAddress
         self.message = message
-        
+
     def register(self, email):
+        """register specific to a MailchuckAccount"""
         self.toAddress = self.registrationAddress
         self.subject = email
         self.message = ""
         self.fromAddress = self.address
         self.send()
-        
+
     def unregister(self):
+        """unregister specific to a MailchuckAccount"""
         self.toAddress = self.unregistrationAddress
         self.subject = ""
         self.message = ""
@@ -227,6 +282,7 @@ class MailchuckAccount(GatewayAccount):
         self.send()
 
     def status(self):
+        """status specific to a MailchuckAccount"""
         self.toAddress = self.registrationAddress
         self.subject = "status"
         self.message = ""
@@ -234,12 +290,16 @@ class MailchuckAccount(GatewayAccount):
         self.send()
 
     def settings(self):
+        """settings specific to a MailchuckAccount"""
+
         self.toAddress = self.registrationAddress
         self.subject = "config"
-        self.message = QtGui.QApplication.translate("Mailchuck", """# You can use this to configure your email gateway account
+        self.message = QtGui.QApplication.translate(
+            "Mailchuck",
+            """# You can use this to configure your email gateway account
 # Uncomment the setting you want to use
 # Here are the options:
-# 
+#
 # pgp: server
 # The email gateway will create and maintain PGP keys for you and sign, verify,
 # encrypt and decrypt on your behalf. When you want to use PGP but are lazy,
@@ -255,7 +315,7 @@ class MailchuckAccount(GatewayAccount):
 #
 # attachments: no
 # Attachments will be ignored.
-# 
+#
 # archive: yes
 # Your incoming emails will be archived on the server. Use this if you need
 # help with debugging problems or you need a third party proof of emails. This
@@ -279,10 +339,12 @@ class MailchuckAccount(GatewayAccount):
         self.fromAddress = self.address
 
     def parseMessage(self, toAddress, fromAddress, subject, message):
+        """parseMessage specific to a MailchuckAccount"""
+
         super(MailchuckAccount, self).parseMessage(toAddress, fromAddress, subject, message)
         if fromAddress == self.relayAddress:
             matches = self.regExpIncoming.search(subject)
-            if not matches is None:
+            if matches is not None:
                 self.subject = ""
                 if not matches.group(1) is None:
                     self.subject += matches.group(1)
@@ -293,7 +355,7 @@ class MailchuckAccount(GatewayAccount):
                     self.fromAddress = matches.group(2)
         if toAddress == self.relayAddress:
             matches = self.regExpOutgoing.search(subject)
-            if not matches is None:
+            if matches is not None:
                 if not matches.group(2) is None:
                     self.subject = matches.group(2)
                 if not matches.group(1) is None:

src/bitmessageqt/settings.py

@@ -1,15 +1,23 @@
 # -*- coding: utf-8 -*-
+# pylint: disable=too-many-instance-attributes,too-many-locals,too-many-statements,attribute-defined-outside-init
+"""
+Form implementation generated from reading ui file 'settings.ui'
 
-# Form implementation generated from reading ui file 'settings.ui'
-#
-# Created: Thu Dec 25 23:21:20 2014
-#      by: PyQt4 UI code generator 4.10.3
-#
-# WARNING! All changes made in this file will be lost!
+Created: Thu Dec 25 23:21:20 2014
+     by: PyQt4 UI code generator 4.10.3
+
+WARNING! All changes made in this file will be lost!
+"""
+
+from __future__ import absolute_import
+
+from sys import platform
 
 from PyQt4 import QtCore, QtGui
-from languagebox import LanguageBox
-from sys import platform
+
+from . import bitmessage_icons_rc  # pylint: disable=unused-import
+from .languagebox import LanguageBox
+
 
 try:
     _fromUtf8 = QtCore.QString.fromUtf8
@@ -19,21 +27,27 @@ except AttributeError:
 
 try:
     _encoding = QtGui.QApplication.UnicodeUTF8
+
     def _translate(context, text, disambig):
         return QtGui.QApplication.translate(context, text, disambig, _encoding)
 except AttributeError:
     def _translate(context, text, disambig):
         return QtGui.QApplication.translate(context, text, disambig)
 
+
 class Ui_settingsDialog(object):
+    """Encapsulate a UI settings dialog object"""
+
     def setupUi(self, settingsDialog):
+        """Set up the UI"""
+
         settingsDialog.setObjectName(_fromUtf8("settingsDialog"))
         settingsDialog.resize(521, 413)
         self.gridLayout = QtGui.QGridLayout(settingsDialog)
         self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
         self.buttonBox = QtGui.QDialogButtonBox(settingsDialog)
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok)
         self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
         self.gridLayout.addWidget(self.buttonBox, 1, 0, 1, 1)
         self.tabWidgetSettings = QtGui.QTabWidget(settingsDialog)
@@ -64,7 +78,8 @@ class Ui_settingsDialog(object):
         self.formLayout.setWidget(1, QtGui.QFormLayout.SpanningRole, self.groupBoxTray)
         self.checkBoxHideTrayConnectionNotifications = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxHideTrayConnectionNotifications.setChecked(False)
-        self.checkBoxHideTrayConnectionNotifications.setObjectName(_fromUtf8("checkBoxHideTrayConnectionNotifications"))
+        self.checkBoxHideTrayConnectionNotifications.setObjectName(
+            _fromUtf8("checkBoxHideTrayConnectionNotifications"))
         self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.checkBoxHideTrayConnectionNotifications)
         self.checkBoxShowTrayNotifications = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxShowTrayNotifications.setObjectName(_fromUtf8("checkBoxShowTrayNotifications"))
@@ -96,7 +111,7 @@ class Ui_settingsDialog(object):
         self.formLayout_2.setObjectName(_fromUtf8("formLayout_2"))
         self.languageComboBox = LanguageBox(self.groupBox)
         self.languageComboBox.setMinimumSize(QtCore.QSize(100, 0))
-        self.languageComboBox.setObjectName(_fromUtf8("languageComboBox"))
+        self.languageComboBox.setObjectName(_fromUtf8("languageComboBox"))  # pylint: disable=not-callable
         self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.languageComboBox)
         self.formLayout.setWidget(9, QtGui.QFormLayout.FieldRole, self.groupBox)
         self.tabWidgetSettings.addTab(self.tabUserInterface, _fromUtf8(""))
@@ -108,8 +123,6 @@ class Ui_settingsDialog(object):
         self.groupBox1.setObjectName(_fromUtf8("groupBox1"))
         self.gridLayout_3 = QtGui.QGridLayout(self.groupBox1)
         self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3"))
-        #spacerItem = QtGui.QSpacerItem(125, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        #self.gridLayout_3.addItem(spacerItem, 0, 0, 1, 1)
         self.label = QtGui.QLabel(self.groupBox1)
         self.label.setObjectName(_fromUtf8("label"))
         self.gridLayout_3.addWidget(self.label, 0, 0, 1, 1, QtCore.Qt.AlignRight)
@@ -165,7 +178,8 @@ class Ui_settingsDialog(object):
         self.lineEditMaxOutboundConnections.setSizePolicy(sizePolicy)
         self.lineEditMaxOutboundConnections.setMaximumSize(QtCore.QSize(60, 16777215))
         self.lineEditMaxOutboundConnections.setObjectName(_fromUtf8("lineEditMaxOutboundConnections"))
-        self.lineEditMaxOutboundConnections.setValidator(QtGui.QIntValidator(0, 8, self.lineEditMaxOutboundConnections))
+        self.lineEditMaxOutboundConnections.setValidator(
+            QtGui.QIntValidator(0, 8, self.lineEditMaxOutboundConnections))
         self.gridLayout_9.addWidget(self.lineEditMaxOutboundConnections, 2, 2, 1, 1)
         self.gridLayout_4.addWidget(self.groupBox_3, 2, 0, 1, 1)
         self.groupBox_2 = QtGui.QGroupBox(self.tabNetworkSettings)
@@ -207,7 +221,8 @@ class Ui_settingsDialog(object):
         self.gridLayout_2.addWidget(self.label_6, 2, 4, 1, 1)
         self.lineEditSocksPassword = QtGui.QLineEdit(self.groupBox_2)
         self.lineEditSocksPassword.setEnabled(False)
-        self.lineEditSocksPassword.setInputMethodHints(QtCore.Qt.ImhHiddenText|QtCore.Qt.ImhNoAutoUppercase|QtCore.Qt.ImhNoPredictiveText)
+        self.lineEditSocksPassword.setInputMethodHints(
+            QtCore.Qt.ImhHiddenText | QtCore.Qt.ImhNoAutoUppercase | QtCore.Qt.ImhNoPredictiveText)
         self.lineEditSocksPassword.setEchoMode(QtGui.QLineEdit.Password)
         self.lineEditSocksPassword.setObjectName(_fromUtf8("lineEditSocksPassword"))
         self.gridLayout_2.addWidget(self.lineEditSocksPassword, 2, 5, 1, 1)
@@ -215,7 +230,7 @@ class Ui_settingsDialog(object):
         self.checkBoxSocksListen.setObjectName(_fromUtf8("checkBoxSocksListen"))
         self.gridLayout_2.addWidget(self.checkBoxSocksListen, 3, 1, 1, 4)
         self.comboBoxProxyType = QtGui.QComboBox(self.groupBox_2)
-        self.comboBoxProxyType.setObjectName(_fromUtf8("comboBoxProxyType"))
+        self.comboBoxProxyType.setObjectName(_fromUtf8("comboBoxProxyType"))  # pylint: disable=not-callable
         self.comboBoxProxyType.addItem(_fromUtf8(""))
         self.comboBoxProxyType.addItem(_fromUtf8(""))
         self.comboBoxProxyType.addItem(_fromUtf8(""))
@@ -229,7 +244,7 @@ class Ui_settingsDialog(object):
         self.gridLayout_6 = QtGui.QGridLayout(self.tabDemandedDifficulty)
         self.gridLayout_6.setObjectName(_fromUtf8("gridLayout_6"))
         self.label_9 = QtGui.QLabel(self.tabDemandedDifficulty)
-        self.label_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_9.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.label_9.setObjectName(_fromUtf8("label_9"))
         self.gridLayout_6.addWidget(self.label_9, 1, 1, 1, 1)
         self.label_10 = QtGui.QLabel(self.tabDemandedDifficulty)
@@ -237,7 +252,7 @@ class Ui_settingsDialog(object):
         self.label_10.setObjectName(_fromUtf8("label_10"))
         self.gridLayout_6.addWidget(self.label_10, 2, 0, 1, 3)
         self.label_11 = QtGui.QLabel(self.tabDemandedDifficulty)
-        self.label_11.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_11.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.label_11.setObjectName(_fromUtf8("label_11"))
         self.gridLayout_6.addWidget(self.label_11, 3, 1, 1, 1)
         self.label_8 = QtGui.QLabel(self.tabDemandedDifficulty)
@@ -285,7 +300,7 @@ class Ui_settingsDialog(object):
         self.gridLayout_7.addItem(spacerItem6, 1, 0, 1, 1)
         self.label_13 = QtGui.QLabel(self.tabMaxAcceptableDifficulty)
         self.label_13.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.label_13.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_13.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.label_13.setObjectName(_fromUtf8("label_13"))
         self.gridLayout_7.addWidget(self.label_13, 1, 1, 1, 1)
         self.lineEditMaxAcceptableTotalDifficulty = QtGui.QLineEdit(self.tabMaxAcceptableDifficulty)
@@ -300,7 +315,7 @@ class Ui_settingsDialog(object):
         spacerItem7 = QtGui.QSpacerItem(102, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.gridLayout_7.addItem(spacerItem7, 2, 0, 1, 1)
         self.label_14 = QtGui.QLabel(self.tabMaxAcceptableDifficulty)
-        self.label_14.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_14.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.label_14.setObjectName(_fromUtf8("label_14"))
         self.gridLayout_7.addWidget(self.label_14, 2, 1, 1, 1)
         self.lineEditMaxAcceptableSmallMessageDifficulty = QtGui.QLineEdit(self.tabMaxAcceptableDifficulty)
@@ -310,7 +325,8 @@ class Ui_settingsDialog(object):
         sizePolicy.setHeightForWidth(self.lineEditMaxAcceptableSmallMessageDifficulty.sizePolicy().hasHeightForWidth())
         self.lineEditMaxAcceptableSmallMessageDifficulty.setSizePolicy(sizePolicy)
         self.lineEditMaxAcceptableSmallMessageDifficulty.setMaximumSize(QtCore.QSize(70, 16777215))
-        self.lineEditMaxAcceptableSmallMessageDifficulty.setObjectName(_fromUtf8("lineEditMaxAcceptableSmallMessageDifficulty"))
+        self.lineEditMaxAcceptableSmallMessageDifficulty.setObjectName(
+            _fromUtf8("lineEditMaxAcceptableSmallMessageDifficulty"))
         self.gridLayout_7.addWidget(self.lineEditMaxAcceptableSmallMessageDifficulty, 2, 2, 1, 1)
         spacerItem8 = QtGui.QSpacerItem(20, 147, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.gridLayout_7.addItem(spacerItem8, 3, 1, 1, 1)
@@ -332,7 +348,7 @@ class Ui_settingsDialog(object):
         self.label_16.setObjectName(_fromUtf8("label_16"))
         self.gridLayout_8.addWidget(self.label_16, 0, 0, 1, 3)
         self.label_17 = QtGui.QLabel(self.tabNamecoin)
-        self.label_17.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_17.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.label_17.setObjectName(_fromUtf8("label_17"))
         self.gridLayout_8.addWidget(self.label_17, 2, 1, 1, 1)
         self.lineEditNamecoinHost = QtGui.QLineEdit(self.tabNamecoin)
@@ -344,7 +360,7 @@ class Ui_settingsDialog(object):
         self.gridLayout_8.addItem(spacerItem11, 4, 0, 1, 1)
         self.label_18 = QtGui.QLabel(self.tabNamecoin)
         self.label_18.setEnabled(True)
-        self.label_18.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_18.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.label_18.setObjectName(_fromUtf8("label_18"))
         self.gridLayout_8.addWidget(self.label_18, 3, 1, 1, 1)
         self.lineEditNamecoinPort = QtGui.QLineEdit(self.tabNamecoin)
@@ -353,7 +369,7 @@ class Ui_settingsDialog(object):
         spacerItem12 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.gridLayout_8.addItem(spacerItem12, 8, 1, 1, 1)
         self.labelNamecoinUser = QtGui.QLabel(self.tabNamecoin)
-        self.labelNamecoinUser.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.labelNamecoinUser.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.labelNamecoinUser.setObjectName(_fromUtf8("labelNamecoinUser"))
         self.gridLayout_8.addWidget(self.labelNamecoinUser, 4, 1, 1, 1)
         self.lineEditNamecoinUser = QtGui.QLineEdit(self.tabNamecoin)
@@ -362,11 +378,13 @@ class Ui_settingsDialog(object):
         spacerItem13 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.gridLayout_8.addItem(spacerItem13, 5, 0, 1, 1)
         self.labelNamecoinPassword = QtGui.QLabel(self.tabNamecoin)
-        self.labelNamecoinPassword.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.labelNamecoinPassword.setAlignment(
+            QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.labelNamecoinPassword.setObjectName(_fromUtf8("labelNamecoinPassword"))
         self.gridLayout_8.addWidget(self.labelNamecoinPassword, 5, 1, 1, 1)
         self.lineEditNamecoinPassword = QtGui.QLineEdit(self.tabNamecoin)
-        self.lineEditNamecoinPassword.setInputMethodHints(QtCore.Qt.ImhHiddenText|QtCore.Qt.ImhNoAutoUppercase|QtCore.Qt.ImhNoPredictiveText)
+        self.lineEditNamecoinPassword.setInputMethodHints(
+            QtCore.Qt.ImhHiddenText | QtCore.Qt.ImhNoAutoUppercase | QtCore.Qt.ImhNoPredictiveText)
         self.lineEditNamecoinPassword.setEchoMode(QtGui.QLineEdit.Password)
         self.lineEditNamecoinPassword.setObjectName(_fromUtf8("lineEditNamecoinPassword"))
         self.gridLayout_8.addWidget(self.lineEditNamecoinPassword, 5, 2, 1, 1)
@@ -405,11 +423,11 @@ class Ui_settingsDialog(object):
         self.widget.setObjectName(_fromUtf8("widget"))
         self.label_19 = QtGui.QLabel(self.widget)
         self.label_19.setGeometry(QtCore.QRect(10, 20, 101, 20))
-        self.label_19.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_19.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.label_19.setObjectName(_fromUtf8("label_19"))
         self.label_20 = QtGui.QLabel(self.widget)
         self.label_20.setGeometry(QtCore.QRect(30, 40, 80, 16))
-        self.label_20.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_20.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
         self.label_20.setObjectName(_fromUtf8("label_20"))
         self.lineEditDays = QtGui.QLineEdit(self.widget)
         self.lineEditDays.setGeometry(QtCore.QRect(113, 20, 51, 20))
@@ -431,10 +449,20 @@ class Ui_settingsDialog(object):
 
         self.retranslateUi(settingsDialog)
         self.tabWidgetSettings.setCurrentIndex(0)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), settingsDialog.accept)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), settingsDialog.reject)
-        QtCore.QObject.connect(self.checkBoxAuthentication, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.lineEditSocksUsername.setEnabled)
-        QtCore.QObject.connect(self.checkBoxAuthentication, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.lineEditSocksPassword.setEnabled)
+        QtCore.QObject.connect(  # pylint: disable=no-member
+            self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), settingsDialog.accept)
+        QtCore.QObject.connect(  # pylint: disable=no-member
+            self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), settingsDialog.reject)
+        QtCore.QObject.connect(  # pylint: disable=no-member
+            self.checkBoxAuthentication,
+            QtCore.SIGNAL(
+                _fromUtf8("toggled(bool)")),
+            self.lineEditSocksUsername.setEnabled)
+        QtCore.QObject.connect(  # pylint: disable=no-member
+            self.checkBoxAuthentication,
+            QtCore.SIGNAL(
+                _fromUtf8("toggled(bool)")),
+            self.lineEditSocksPassword.setEnabled)
         QtCore.QMetaObject.connectSlotsByName(settingsDialog)
         settingsDialog.setTabOrder(self.tabWidgetSettings, self.checkBoxStartOnLogon)
         settingsDialog.setTabOrder(self.checkBoxStartOnLogon, self.checkBoxStartInTray)
@@ -450,22 +478,47 @@ class Ui_settingsDialog(object):
         settingsDialog.setTabOrder(self.checkBoxSocksListen, self.buttonBox)
 
     def retranslateUi(self, settingsDialog):
+        """Re-translate the UI into the supported languages"""
+
         settingsDialog.setWindowTitle(_translate("settingsDialog", "Settings", None))
         self.checkBoxStartOnLogon.setText(_translate("settingsDialog", "Start Bitmessage on user login", None))
         self.groupBoxTray.setTitle(_translate("settingsDialog", "Tray", None))
-        self.checkBoxStartInTray.setText(_translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None))
+        self.checkBoxStartInTray.setText(
+            _translate(
+                "settingsDialog",
+                "Start Bitmessage in the tray (don\'t show main window)",
+                None))
         self.checkBoxMinimizeToTray.setText(_translate("settingsDialog", "Minimize to tray", None))
         self.checkBoxTrayOnClose.setText(_translate("settingsDialog", "Close to tray", None))
-        self.checkBoxHideTrayConnectionNotifications.setText(_translate("settingsDialog", "Hide connection notifications", None))
-        self.checkBoxShowTrayNotifications.setText(_translate("settingsDialog", "Show notification when message received", None))
+        self.checkBoxHideTrayConnectionNotifications.setText(
+            _translate("settingsDialog", "Hide connection notifications", None))
+        self.checkBoxShowTrayNotifications.setText(
+            _translate(
+                "settingsDialog",
+                "Show notification when message received",
+                None))
         self.checkBoxPortableMode.setText(_translate("settingsDialog", "Run in Portable Mode", None))
-        self.PortableModeDescription.setText(_translate("settingsDialog", "In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.", None))
-        self.checkBoxWillinglySendToMobile.setText(_translate("settingsDialog", "Willingly include unencrypted destination address when sending to a mobile device", None))
+        self.PortableModeDescription.setText(
+            _translate(
+                "settingsDialog",
+                "In Portable Mode, messages and config files are stored in the same directory as the"
+                " program rather than the normal application-data folder. This makes it convenient to"
+                " run Bitmessage from a USB thumb drive.",
+                None))
+        self.checkBoxWillinglySendToMobile.setText(
+            _translate(
+                "settingsDialog",
+                "Willingly include unencrypted destination address when sending to a mobile device",
+                None))
         self.checkBoxUseIdenticons.setText(_translate("settingsDialog", "Use Identicons", None))
         self.checkBoxReplyBelow.setText(_translate("settingsDialog", "Reply below Quote", None))
         self.groupBox.setTitle(_translate("settingsDialog", "Interface Language", None))
         self.languageComboBox.setItemText(0, _translate("settingsDialog", "System Settings", "system"))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), _translate("settingsDialog", "User Interface", None))
+        self.tabWidgetSettings.setTabText(
+            self.tabWidgetSettings.indexOf(
+                self.tabUserInterface),
+            _translate(
+                "settingsDialog", "User Interface", None))
         self.groupBox1.setTitle(_translate("settingsDialog", "Listening port", None))
         self.label.setText(_translate("settingsDialog", "Listen for connections on port:", None))
         self.labelUPnP.setText(_translate("settingsDialog", "UPnP:", None))
@@ -480,23 +533,70 @@ class Ui_settingsDialog(object):
         self.checkBoxAuthentication.setText(_translate("settingsDialog", "Authentication", None))
         self.label_5.setText(_translate("settingsDialog", "Username:", None))
         self.label_6.setText(_translate("settingsDialog", "Pass:", None))
-        self.checkBoxSocksListen.setText(_translate("settingsDialog", "Listen for incoming connections when using proxy", None))
+        self.checkBoxSocksListen.setText(
+            _translate(
+                "settingsDialog",
+                "Listen for incoming connections when using proxy",
+                None))
         self.comboBoxProxyType.setItemText(0, _translate("settingsDialog", "none", None))
         self.comboBoxProxyType.setItemText(1, _translate("settingsDialog", "SOCKS4a", None))
         self.comboBoxProxyType.setItemText(2, _translate("settingsDialog", "SOCKS5", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabNetworkSettings), _translate("settingsDialog", "Network Settings", None))
+        self.tabWidgetSettings.setTabText(
+            self.tabWidgetSettings.indexOf(
+                self.tabNetworkSettings),
+            _translate(
+                "settingsDialog", "Network Settings", None))
         self.label_9.setText(_translate("settingsDialog", "Total difficulty:", None))
-        self.label_10.setText(_translate("settingsDialog", "The \'Total difficulty\' affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.", None))
+        self.label_10.setText(
+            _translate(
+                "settingsDialog",
+                "The \'Total difficulty\' affects the absolute amount of work the sender must complete."
+                " Doubling this value doubles the amount of work.",
+                None))
         self.label_11.setText(_translate("settingsDialog", "Small message difficulty:", None))
-        self.label_8.setText(_translate("settingsDialog", "When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. ", None))
-        self.label_12.setText(_translate("settingsDialog", "The \'Small message difficulty\' mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn\'t really affect large messages.", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabDemandedDifficulty), _translate("settingsDialog", "Demanded difficulty", None))
-        self.label_15.setText(_translate("settingsDialog", "Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable.", None))
+        self.label_8.setText(_translate(
+            "settingsDialog",
+            "When someone sends you a message, their computer must first complete some work. The difficulty of this"
+            " work, by default, is 1. You may raise this default for new addresses you create by changing the values"
+            " here. Any new addresses you create will require senders to meet the higher difficulty. There is one"
+            " exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically"
+            " notify them when you next send a message that they need only complete the minimum amount of"
+            " work: difficulty 1. ",
+            None))
+        self.label_12.setText(
+            _translate(
+                "settingsDialog",
+                "The \'Small message difficulty\' mostly only affects the difficulty of sending small messages."
+                " Doubling this value makes it almost twice as difficult to send a small message but doesn\'t really"
+                " affect large messages.",
+                None))
+        self.tabWidgetSettings.setTabText(
+            self.tabWidgetSettings.indexOf(
+                self.tabDemandedDifficulty),
+            _translate(
+                "settingsDialog", "Demanded difficulty", None))
+        self.label_15.setText(
+            _translate(
+                "settingsDialog",
+                "Here you may set the maximum amount of work you are willing to do to send a message to another"
+                " person. Setting these values to 0 means that any value is acceptable.",
+                None))
         self.label_13.setText(_translate("settingsDialog", "Maximum acceptable total difficulty:", None))
         self.label_14.setText(_translate("settingsDialog", "Maximum acceptable small message difficulty:", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabMaxAcceptableDifficulty), _translate("settingsDialog", "Max acceptable difficulty", None))
+        self.tabWidgetSettings.setTabText(
+            self.tabWidgetSettings.indexOf(
+                self.tabMaxAcceptableDifficulty),
+            _translate(
+                "settingsDialog", "Max acceptable difficulty", None))
         self.labelOpenCL.setText(_translate("settingsDialog", "Hardware GPU acceleration (OpenCL):", None))
-        self.label_16.setText(_translate("settingsDialog", "<html><head/><body><p>Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to <span style=\" font-style:italic;\">test. </span></p><p>(Getting your own Bitmessage address into Namecoin is still rather difficult).</p><p>Bitmessage can use either namecoind directly or a running nmcontrol instance.</p></body></html>", None))
+        self.label_16.setText(_translate(
+            "settingsDialog",
+            "<html><head/><body><p>Bitmessage can utilize a different Bitcoin-based program called Namecoin to make"
+            " addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage"
+            " address, you can simply tell him to send a message to <span style=\" font-style:italic;\">test."
+            " </span></p><p>(Getting your own Bitmessage address into Namecoin is still rather difficult).</p>"
+            "<p>Bitmessage can use either namecoind directly or a running nmcontrol instance.</p></body></html>",
+            None))
         self.label_17.setText(_translate("settingsDialog", "Host:", None))
         self.label_18.setText(_translate("settingsDialog", "Port:", None))
         self.labelNamecoinUser.setText(_translate("settingsDialog", "Username:", None))
@@ -505,12 +605,26 @@ class Ui_settingsDialog(object):
         self.label_21.setText(_translate("settingsDialog", "Connect to:", None))
         self.radioButtonNamecoinNamecoind.setText(_translate("settingsDialog", "Namecoind", None))
         self.radioButtonNamecoinNmcontrol.setText(_translate("settingsDialog", "NMControl", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabNamecoin), _translate("settingsDialog", "Namecoin integration", None))
-        self.label_7.setText(_translate("settingsDialog", "<html><head/><body><p>By default, if you send a message to someone and he is offline for more than two days, Bitmessage will send the message again after an additional two days. This will be continued with exponential backoff forever; messages will be resent after 5, 10, 20 days ect. until the receiver acknowledges them. Here you may change that behavior by having Bitmessage give up after a certain number of days or months.</p><p>Leave these input fields blank for the default behavior. </p></body></html>", None))
+        self.tabWidgetSettings.setTabText(
+            self.tabWidgetSettings.indexOf(
+                self.tabNamecoin),
+            _translate(
+                "settingsDialog", "Namecoin integration", None))
+        self.label_7.setText(_translate(
+            "settingsDialog",
+            "<html><head/><body><p>By default, if you send a message to someone and he is offline for more than two"
+            " days, Bitmessage will send the message again after an additional two days. This will be continued with"
+            " exponential backoff forever; messages will be resent after 5, 10, 20 days ect. until the receiver"
+            " acknowledges them. Here you may change that behavior by having Bitmessage give up after a certain"
+            " number of days or months.</p><p>Leave these input fields blank for the default behavior."
+            " </p></body></html>",
+            None))
         self.label_19.setText(_translate("settingsDialog", "Give up after", None))
         self.label_20.setText(_translate("settingsDialog", "and", None))
         self.label_22.setText(_translate("settingsDialog", "days", None))
         self.label_23.setText(_translate("settingsDialog", "months.", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabResendsExpire), _translate("settingsDialog", "Resends Expire", None))
-
-import bitmessage_icons_rc
+        self.tabWidgetSettings.setTabText(
+            self.tabWidgetSettings.indexOf(
+                self.tabResendsExpire),
+            _translate(
+                "settingsDialog", "Resends Expire", None))

src/debug.py

@@ -4,23 +4,26 @@ Logging and debuging facility
 =============================
 
 Levels:
-    DEBUG       Detailed information, typically of interest only when
-                diagnosing problems.
-    INFO        Confirmation that things are working as expected.
-    WARNING     An indication that something unexpected happened, or indicative
-                of some problem in the near future (e.g. ‘disk space low’).
-                The software is still working as expected.
-    ERROR       Due to a more serious problem, the software has not been able
-                to perform some function.
-    CRITICAL    A serious error, indicating that the program itself may be
-                unable to continue running.
+
+   DEBUG
+      Detailed information, typically of interest only when diagnosing problems.
+   INFO
+      Confirmation that things are working as expected.
+   WARNING
+      An indication that something unexpected happened, or indicative of some problem in the
+      near future (e.g. ‘disk space low’). The software is still working as expected.
+   ERROR
+      Due to a more serious problem, the software has not been able to perform some function.
+   CRITICAL
+      A serious error, indicating that the program itself may be unable to continue running.
 
 There are three loggers: `console_only`, `file_only` and `both`.
 
-Use: `from debug import logger` to import this facility into whatever module
-     you wish to log messages from. Logging is thread-safe so you don't have
-     to worry about locks, just import and log.
+Use: `from debug import logger` to import this facility into whatever module you wish to log messages from.
+    Logging is thread-safe so you don't have to worry about locks, just import and log.
+
 """
+
 import logging
 import logging.config
 import os
@@ -56,9 +59,8 @@ def configureLogging():
                 ' logging config\n%s' %
                 (os.path.join(state.appdata, 'logging.dat'), sys.exc_info()))
         else:
-            # no need to confuse the user if the logger config
-            # is missing entirely
-            print('Using default logger configuration')
+            # no need to confuse the user if the logger config is missing entirely
+            print "Using default logger configuration"
 
     sys.excepthook = log_uncaught_exceptions
 
@@ -111,17 +113,20 @@ def configureLogging():
     return True
 
 
-# TODO (xj9): Get from a config file.
-# logger = logging.getLogger('console_only')
-if configureLogging():
-    if '-c' in sys.argv:
-        logger = logging.getLogger('file_only')
+if __name__ == "__main__":
+
+    # TODO (xj9): Get from a config file.
+    #logger = logging.getLogger('console_only')
+    if configureLogging():
+        if '-c' in sys.argv:
+            logger = logging.getLogger('file_only')
+        else:
+            logger = logging.getLogger('both')
     else:
-        logger = logging.getLogger('both')
+        logger = logging.getLogger('default')
 else:
     logger = logging.getLogger('default')
 
-
 def restartLoggingInUpdatedAppdataLocation():
     global logger
     for i in list(logger.handlers):
@@ -135,3 +140,4 @@ def restartLoggingInUpdatedAppdataLocation():
             logger = logging.getLogger('both')
     else:
         logger = logging.getLogger('default')
+

src/depends.py

@@ -1,5 +1,6 @@
 #! python
 
+import subprocess
 import sys
 import os
 import pyelliptic.openssl
@@ -145,7 +146,10 @@ def check_openssl():
         except OSError:
             continue
         logger.info('OpenSSL Name: ' + library._name)
-        openssl_version, openssl_hexversion, openssl_cflags = pyelliptic.openssl.get_version(library)
+        try:
+            openssl_version, openssl_hexversion, openssl_cflags = pyelliptic.openssl.get_version(library)
+        except AttributeError:  # sphinx chokes
+            return True
         if not openssl_version:
             logger.error('Cannot determine version of this OpenSSL library.')
             return False
@@ -167,7 +171,7 @@ def check_openssl():
 def check_curses():
     """Do curses dependency check.
 
-    Here we are checking for curses if available or not with check 
+    Here we are checking for curses if available or not with check
     as interface requires the pythondialog\ package and the dialog
     utility.
     """
@@ -185,6 +189,12 @@ def check_curses():
     except ImportError:
         logger.error('The curses interface can not be used. The pythondialog package is not available.')
         return False
+    try:
+        subprocess.check_call('which dialog')
+    except subprocess.CalledProcessError:
+        logger.error('Curses requires the `dialog` command to be installed as well as the python library.')
+        return False
+
     logger.info('pythondialog Package Version: ' + dialog.__version__)
     dialog_util_version = dialog.Dialog().cached_backend_version
     #The pythondialog author does not like Python2 str, so we have to use
@@ -236,7 +246,7 @@ def check_pyqt():
 def check_msgpack():
     """Do sgpack module check.
 
-    simply checking if msgpack package with all its dependency 
+    simply checking if msgpack package with all its dependency
     is available or not as recommended for messages coding.
     """
     try:
@@ -300,7 +310,7 @@ def check_dependencies(verbose = False, optional = False):
         except:
             logger.exception(check.__name__ + ' failed unexpectedly.')
             has_all_dependencies = False
-        
+
     if not has_all_dependencies:
         logger.critical('PyBitmessage cannot start. One or more dependencies are unavailable.')
         sys.exit()

src/fallback/__init__.py

@@ -0,0 +1,3 @@
+"""
+.. todo:: hello world
+"""

src/fallback/umsgpack/umsgpack.py

@@ -205,7 +205,7 @@ load = None
 loads = None
 
 compatibility = False
-"""
+u"""
 Compatibility mode boolean.
 
 When compatibility mode is enabled, u-msgpack-python will serialize both

src/message_data_reader.py

@@ -1,22 +1,32 @@
-#This program can be used to print out everything in your Inbox or Sent folders and also take things out of the trash.
-#Scroll down to the bottom to see the functions that you can uncomment. Save then run this file.
-#The functions which only read the database file seem to function just fine even if you have Bitmessage running but you should definitly close it before running the functions that make changes (like taking items out of the trash).
+# pylint: disable=too-many-locals
+"""
+This program can be used to print out everything in your Inbox or Sent folders and also take things out of the trash.
+Scroll down to the bottom to see the functions that you can uncomment. Save then run this file.
+The functions which only read the database file seem to function just
+fine even if you have Bitmessage running but you should definitly close
+it before running the functions that make changes (like taking items out
+of the trash).
+"""
+
+from __future__ import absolute_import
 
 import sqlite3
+from binascii import hexlify
 from time import strftime, localtime
-import sys
+
 import paths
 import queues
-import state
-from binascii import hexlify
+
 
 appdata = paths.lookupAppdataFolder()
 
-conn = sqlite3.connect( appdata + 'messages.dat' )
+conn = sqlite3.connect(appdata + 'messages.dat')
 conn.text_factory = str
 cur = conn.cursor()
 
+
 def readInbox():
+    """Print each row from inbox table"""
     print 'Printing everything in inbox table:'
     item = '''select * from inbox'''
     parameters = ''
@@ -25,17 +35,24 @@ def readInbox():
     for row in output:
         print row
 
+
 def readSent():
+    """Print each row from sent table"""
     print 'Printing everything in Sent table:'
     item = '''select * from sent where folder !='trash' '''
     parameters = ''
     cur.execute(item, parameters)
     output = cur.fetchall()
     for row in output:
-        msgid, toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, sleeptill, status, retrynumber, folder, encodingtype, ttl = row
-        print hexlify(msgid), toaddress, 'toripe:', hexlify(toripe), 'fromaddress:', fromaddress, 'ENCODING TYPE:', encodingtype, 'SUBJECT:', repr(subject), 'MESSAGE:', repr(message), 'ACKDATA:', hexlify(ackdata), lastactiontime, status, retrynumber, folder
+        (msgid, toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime,
+         sleeptill, status, retrynumber, folder, encodingtype, ttl) = row  # pylint: disable=unused-variable
+        print(hexlify(msgid), toaddress, 'toripe:', hexlify(toripe), 'fromaddress:', fromaddress, 'ENCODING TYPE:',
+              encodingtype, 'SUBJECT:', repr(subject), 'MESSAGE:', repr(message), 'ACKDATA:', hexlify(ackdata),
+              lastactiontime, status, retrynumber, folder)
+
 
 def readSubscriptions():
+    """Print each row from subscriptions table"""
     print 'Printing everything in subscriptions table:'
     item = '''select * from subscriptions'''
     parameters = ''
@@ -44,7 +61,9 @@ def readSubscriptions():
     for row in output:
         print row
 
+
 def readPubkeys():
+    """Print each row from pubkeys table"""
     print 'Printing everything in pubkeys table:'
     item = '''select address, transmitdata, time, usedpersonally from pubkeys'''
     parameters = ''
@@ -52,61 +71,66 @@ def readPubkeys():
     output = cur.fetchall()
     for row in output:
         address, transmitdata, time, usedpersonally = row
-        print 'Address:', address, '\tTime first broadcast:', unicode(strftime('%a, %d %b %Y  %I:%M %p',localtime(time)),'utf-8'), '\tUsed by me personally:', usedpersonally, '\tFull pubkey message:', hexlify(transmitdata)
+        print(
+            'Address:', address, '\tTime first broadcast:', unicode(
+                strftime('%a, %d %b %Y  %I:%M %p', localtime(time)), 'utf-8'),
+            '\tUsed by me personally:', usedpersonally, '\tFull pubkey message:', hexlify(transmitdata),
+        )
+
 
 def readInventory():
+    """Print each row from inventory table"""
     print 'Printing everything in inventory table:'
     item = '''select hash, objecttype, streamnumber, payload, expirestime from inventory'''
     parameters = ''
     cur.execute(item, parameters)
     output = cur.fetchall()
     for row in output:
-        hash, objecttype, streamnumber, payload, expirestime = row
-        print 'Hash:', hexlify(hash), objecttype, streamnumber, '\t', hexlify(payload), '\t', unicode(strftime('%a, %d %b %Y  %I:%M %p',localtime(expirestime)),'utf-8')
+        obj_hash, objecttype, streamnumber, payload, expirestime = row
+        print 'Hash:', hexlify(obj_hash), objecttype, streamnumber, '\t', hexlify(payload), '\t', unicode(
+            strftime('%a, %d %b %Y  %I:%M %p', localtime(expirestime)), 'utf-8')
 
 
 def takeInboxMessagesOutOfTrash():
+    """Update all inbox messages with folder=trash to have folder=inbox"""
     item = '''update inbox set folder='inbox' where folder='trash' '''
     parameters = ''
     cur.execute(item, parameters)
-    output = cur.fetchall()
+    _ = cur.fetchall()
     conn.commit()
     print 'done'
 
+
 def takeSentMessagesOutOfTrash():
+    """Update all sent messages with folder=trash to have folder=sent"""
     item = '''update sent set folder='sent' where folder='trash' '''
     parameters = ''
     cur.execute(item, parameters)
-    output = cur.fetchall()
+    _ = cur.fetchall()
     conn.commit()
     print 'done'
 
+
 def markAllInboxMessagesAsUnread():
+    """Update all messages in inbox to have read=0"""
     item = '''update inbox set read='0' '''
     parameters = ''
     cur.execute(item, parameters)
-    output = cur.fetchall()
+    _ = cur.fetchall()
     conn.commit()
     queues.UISignalQueue.put(('changedInboxUnread', None))
     print 'done'
 
+
 def vacuum():
+    """Perform a vacuum on the database"""
     item = '''VACUUM'''
     parameters = ''
     cur.execute(item, parameters)
-    output = cur.fetchall()
+    _ = cur.fetchall()
     conn.commit()
     print 'done'
 
-#takeInboxMessagesOutOfTrash()
-#takeSentMessagesOutOfTrash()
-#markAllInboxMessagesAsUnread()
-readInbox()
-#readSent()
-#readPubkeys()
-#readSubscriptions()
-#readInventory()
-#vacuum()  #will defragment and clean empty space from the messages.dat file.
-
-
 
+if __name__ == '__main__':
+    readInbox()

src/namecoin.py

@@ -1,54 +1,64 @@
-# Copyright (C) 2013 by Daniel Kraft <d@domob.eu>
-# This file is part of the Bitmessage project.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+# pylint: disable=too-many-branches,protected-access
+"""
+Copyright (C) 2013 by Daniel Kraft <d@domob.eu>
+This file is part of the Bitmessage project.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+.. todo:: from debug import logger crashes PyBitmessage due to a circular dependency. The debug module will also
+override/disable logging.getLogger() # loggers so module level logging functions are used instead
+"""
+
+from __future__ import absolute_import
 
 import base64
 import httplib
 import json
+import os
 import socket
 import sys
-import os
 
-from bmconfigparser import BMConfigParser
-import defaults
-import tr # translate
-
-# FIXME: from debug import logger crashes PyBitmessage due to a circular
-# dependency. The debug module will also override/disable logging.getLogger()
-# loggers so module level logging functions are used instead
 import logging as logger
+import defaults
+import tr  # translate
+from bmconfigparser import BMConfigParser
+
 
 configSection = "bitmessagesettings"
 
-# Error thrown when the RPC call returns an error.
-class RPCError (Exception):
+
+class RPCError(Exception):
+    """Error thrown when the RPC call returns an error."""
+
     error = None
 
-    def __init__ (self, data):
+    def __init__(self, data):
+        super(RPCError, self).__init__()
         self.error = data
-        
+
     def __str__(self):
         return '{0}: {1}'.format(type(self).__name__, self.error)
 
-# This class handles the Namecoin identity integration.
-class namecoinConnection (object):
+
+class namecoinConnection(object):
+    """This class handles the Namecoin identity integration."""
+
     user = None
     password = None
     host = None
@@ -58,47 +68,51 @@ class namecoinConnection (object):
     queryid = 1
     con = None
 
-    # Initialise.  If options are given, take the connection settings from
-    # them instead of loading from the configs.  This can be used to test
-    # currently entered connection settings in the config dialog without
-    # actually changing the values (yet).
-    def __init__ (self, options = None):
+    def __init__(self, options=None):
+        """
+        Initialise.  If options are given, take the connection settings from
+        them instead of loading from the configs.  This can be used to test
+        currently entered connection settings in the config dialog without
+        actually changing the values (yet).
+        """
         if options is None:
-          self.nmctype = BMConfigParser().get (configSection, "namecoinrpctype")
-          self.host = BMConfigParser().get (configSection, "namecoinrpchost")
-          self.port = int(BMConfigParser().get (configSection, "namecoinrpcport"))
-          self.user = BMConfigParser().get (configSection, "namecoinrpcuser")
-          self.password = BMConfigParser().get (configSection,
-                                             "namecoinrpcpassword")
+            self.nmctype = BMConfigParser().get(configSection, "namecoinrpctype")
+            self.host = BMConfigParser().get(configSection, "namecoinrpchost")
+            self.port = int(BMConfigParser().get(configSection, "namecoinrpcport"))
+            self.user = BMConfigParser().get(configSection, "namecoinrpcuser")
+            self.password = BMConfigParser().get(configSection,
+                                                 "namecoinrpcpassword")
         else:
-          self.nmctype = options["type"]
-          self.host = options["host"]
-          self.port = int(options["port"])
-          self.user = options["user"]
-          self.password = options["password"]
+            self.nmctype = options["type"]
+            self.host = options["host"]
+            self.port = int(options["port"])
+            self.user = options["user"]
+            self.password = options["password"]
 
         assert self.nmctype == "namecoind" or self.nmctype == "nmcontrol"
         if self.nmctype == "namecoind":
-            self.con = httplib.HTTPConnection(self.host, self.port, timeout = 3)
+            self.con = httplib.HTTPConnection(self.host, self.port, timeout=3)
 
-    # Query for the bitmessage address corresponding to the given identity
-    # string.  If it doesn't contain a slash, id/ is prepended.  We return
-    # the result as (Error, Address) pair, where the Error is an error
-    # message to display or None in case of success.
-    def query (self, string):
-        slashPos = string.find ("/")
+    def query(self, string):
+        """
+        Query for the bitmessage address corresponding to the given identity
+        string.  If it doesn't contain a slash, id/ is prepended.  We return
+        the result as (Error, Address) pair, where the Error is an error
+        message to display or None in case of success.
+        """
+        slashPos = string.find("/")
         if slashPos < 0:
             string = "id/" + string
 
         try:
             if self.nmctype == "namecoind":
-                res = self.callRPC ("name_show", [string])
+                res = self.callRPC("name_show", [string])
                 res = res["value"]
             elif self.nmctype == "nmcontrol":
-                res = self.callRPC ("data", ["getValue", string])
+                res = self.callRPC("data", ["getValue", string])
                 res = res["reply"]
-                if res == False:
-                    return (tr._translate("MainWindow",'The name %1 was not found.').arg(unicode(string)), None)
+                if not res:
+                    return (tr._translate("MainWindow", 'The name %1 was not found.').arg(unicode(string)), None)
             else:
                 assert False
         except RPCError as exc:
@@ -107,16 +121,16 @@ class namecoinConnection (object):
                 errmsg = exc.error["message"]
             else:
                 errmsg = exc.error
-            return (tr._translate("MainWindow",'The namecoin query failed (%1)').arg(unicode(errmsg)), None)
-        except Exception as exc:
+            return (tr._translate("MainWindow", 'The namecoin query failed (%1)').arg(unicode(errmsg)), None)
+        except Exception:
             logger.exception("Namecoin query exception")
-            return (tr._translate("MainWindow",'The namecoin query failed.'), None)
+            return (tr._translate("MainWindow", 'The namecoin query failed.'), None)
 
         try:
-            val = json.loads (res)
+            val = json.loads(res)
         except:
             logger.exception("Namecoin query json exception")
-            return (tr._translate("MainWindow",'The name %1 has no valid JSON data.').arg(unicode(string)), None)            
+            return (tr._translate("MainWindow", 'The name %1 has no valid JSON data.').arg(unicode(string)), None)
 
         if "bitmessage" in val:
             if "name" in val:
@@ -124,12 +138,19 @@ class namecoinConnection (object):
             else:
                 ret = val["bitmessage"]
             return (None, ret)
-        return (tr._translate("MainWindow",'The name %1 has no associated Bitmessage address.').arg(unicode(string)), None) 
+        return (
+            tr._translate(
+                "MainWindow",
+                'The name %1 has no associated Bitmessage address.').arg(
+                    unicode(string)),
+            None)
 
-    # Test the connection settings.  This routine tries to query a "getinfo"
-    # command, and builds either an error message or a success message with
-    # some info from it.
     def test(self):
+        """
+        Test the connection settings.  This routine tries to query a "getinfo"
+        command, and builds either an error message or a success message with
+        some info from it.
+        """
         try:
             if self.nmctype == "namecoind":
                 try:
@@ -143,22 +164,30 @@ class namecoinConnection (object):
                 vers = vers / 100
                 v1 = vers
                 if v3 == 0:
-                  versStr = "0.%d.%d" % (v1, v2)
+                    versStr = "0.%d.%d" % (v1, v2)
                 else:
-                  versStr = "0.%d.%d.%d" % (v1, v2, v3)
-                return ('success',  tr._translate("MainWindow",'Success!  Namecoind version %1 running.').arg(unicode(versStr)) )
+                    versStr = "0.%d.%d.%d" % (v1, v2, v3)
+                message = (
+                    'success',
+                    tr._translate(
+                        "MainWindow",
+                        'Success!  Namecoind version %1 running.').arg(
+                            unicode(versStr)))
 
             elif self.nmctype == "nmcontrol":
-                res = self.callRPC ("data", ["status"])
+                res = self.callRPC("data", ["status"])
                 prefix = "Plugin data running"
                 if ("reply" in res) and res["reply"][:len(prefix)] == prefix:
-                    return ('success', tr._translate("MainWindow",'Success!  NMControll is up and running.'))
+                    return ('success', tr._translate("MainWindow", 'Success!  NMControll is up and running.'))
 
                 logger.error("Unexpected nmcontrol reply: %s", res)
-                return ('failed',  tr._translate("MainWindow",'Couldn\'t understand NMControl.'))
+                message = ('failed', tr._translate("MainWindow", 'Couldn\'t understand NMControl.'))
 
             else:
-                assert False
+                print "Unsupported Namecoin type"
+                sys.exit(1)
+
+            return message
 
         except Exception:
             logger.info("Namecoin connection test failure")
@@ -168,20 +197,21 @@ class namecoinConnection (object):
                     "MainWindow", "The connection to namecoin failed.")
             )
 
-    # Helper routine that actually performs an JSON RPC call.
-    def callRPC (self, method, params):
+    def callRPC(self, method, params):
+        """Helper routine that actually performs an JSON RPC call."""
+
         data = {"method": method, "params": params, "id": self.queryid}
         if self.nmctype == "namecoind":
-          resp = self.queryHTTP (json.dumps (data))
+            resp = self.queryHTTP(json.dumps(data))
         elif self.nmctype == "nmcontrol":
-          resp = self.queryServer (json.dumps (data))
+            resp = self.queryServer(json.dumps(data))
         else:
-          assert False
-        val = json.loads (resp)
+            assert False
+        val = json.loads(resp)
 
         if val["id"] != self.queryid:
-            raise Exception ("ID mismatch in JSON RPC answer.")
-        
+            raise Exception("ID mismatch in JSON RPC answer.")
+
         if self.nmctype == "namecoind":
             self.queryid = self.queryid + 1
 
@@ -190,11 +220,12 @@ class namecoinConnection (object):
             return val["result"]
 
         if isinstance(error, bool):
-            raise RPCError (val["result"])
-        raise RPCError (error)
+            raise RPCError(val["result"])
+        raise RPCError(error)
+
+    def queryHTTP(self, data):
+        """Query the server via HTTP."""
 
-    # Query the server via HTTP.
-    def queryHTTP (self, data):
         result = None
 
         try:
@@ -206,14 +237,14 @@ class namecoinConnection (object):
             self.con.putheader("Content-Length", str(len(data)))
             self.con.putheader("Accept", "application/json")
             authstr = "%s:%s" % (self.user, self.password)
-            self.con.putheader("Authorization", "Basic %s" % base64.b64encode (authstr))
+            self.con.putheader("Authorization", "Basic %s" % base64.b64encode(authstr))
             self.con.endheaders()
             self.con.send(data)
             try:
                 resp = self.con.getresponse()
                 result = resp.read()
                 if resp.status != 200:
-                    raise Exception ("Namecoin returned status %i: %s", resp.status, resp.reason)
+                    raise Exception("Namecoin returned status %i: %s" % resp.status, resp.reason)
             except:
                 logger.info("HTTP receive error")
         except:
@@ -221,41 +252,49 @@ class namecoinConnection (object):
 
         return result
 
-    # Helper routine sending data to the RPC server and returning the result.
-    def queryServer (self, data):
+    def queryServer(self, data):
+        """Helper routine sending data to the RPC server and returning the result."""
+
         try:
-            s = socket.socket (socket.AF_INET, socket.SOCK_STREAM)
-            s.setsockopt (socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            s.settimeout(3) 
-            s.connect ((self.host, self.port))
-            s.sendall (data)
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            s.settimeout(3)
+            s.connect((self.host, self.port))
+            s.sendall(data)
             result = ""
 
             while True:
-                tmp = s.recv (self.bufsize)
+                tmp = s.recv(self.bufsize)
                 if not tmp:
-                  break
+                    break
                 result += tmp
 
-            s.close ()
+            s.close()
 
             return result
 
         except socket.error as exc:
-            raise Exception ("Socket error in RPC connection: %s" % str (exc))
+            raise Exception("Socket error in RPC connection: %s" % str(exc))
+
+
+def lookupNamecoinFolder():
+    """
+    Look up the namecoin data folder.
+
+    .. todo:: Check whether this works on other platforms as well!
+    """
 
-# Look up the namecoin data folder.
-# FIXME: Check whether this works on other platforms as well!
-def lookupNamecoinFolder ():
     app = "namecoin"
     from os import path, environ
     if sys.platform == "darwin":
         if "HOME" in environ:
-            dataFolder = path.join (os.environ["HOME"],
-                                    "Library/Application Support/", app) + '/'
+            dataFolder = path.join(os.environ["HOME"],
+                                   "Library/Application Support/", app) + '/'
         else:
-            print ("Could not find home folder, please report this message"
-                    + " and your OS X version to the BitMessage Github.")
+            print(
+                "Could not find home folder, please report this message"
+                " and your OS X version to the BitMessage Github."
+            )
             sys.exit()
 
     elif "win32" in sys.platform or "win64" in sys.platform:
@@ -265,34 +304,38 @@ def lookupNamecoinFolder ():
 
     return dataFolder
 
-# Ensure all namecoin options are set, by setting those to default values
-# that aren't there.
-def ensureNamecoinOptions ():
-    if not BMConfigParser().has_option (configSection, "namecoinrpctype"):
-        BMConfigParser().set (configSection, "namecoinrpctype", "namecoind")
-    if not BMConfigParser().has_option (configSection, "namecoinrpchost"):
-        BMConfigParser().set (configSection, "namecoinrpchost", "localhost")
 
-    hasUser = BMConfigParser().has_option (configSection, "namecoinrpcuser")
-    hasPass = BMConfigParser().has_option (configSection, "namecoinrpcpassword")
-    hasPort = BMConfigParser().has_option (configSection, "namecoinrpcport")
+def ensureNamecoinOptions():
+    """
+    Ensure all namecoin options are set, by setting those to default values
+    that aren't there.
+    """
+
+    if not BMConfigParser().has_option(configSection, "namecoinrpctype"):
+        BMConfigParser().set(configSection, "namecoinrpctype", "namecoind")
+    if not BMConfigParser().has_option(configSection, "namecoinrpchost"):
+        BMConfigParser().set(configSection, "namecoinrpchost", "localhost")
+
+    hasUser = BMConfigParser().has_option(configSection, "namecoinrpcuser")
+    hasPass = BMConfigParser().has_option(configSection, "namecoinrpcpassword")
+    hasPort = BMConfigParser().has_option(configSection, "namecoinrpcport")
 
     # Try to read user/password from .namecoin configuration file.
     defaultUser = ""
     defaultPass = ""
-    nmcFolder = lookupNamecoinFolder ()
+    nmcFolder = lookupNamecoinFolder()
     nmcConfig = nmcFolder + "namecoin.conf"
     try:
-        nmc = open (nmcConfig, "r")
+        nmc = open(nmcConfig, "r")
 
         while True:
-            line = nmc.readline ()
+            line = nmc.readline()
             if line == "":
                 break
-            parts = line.split ("=")
-            if len (parts) == 2:
+            parts = line.split("=")
+            if len(parts) == 2:
                 key = parts[0]
-                val = parts[1].rstrip ()
+                val = parts[1].rstrip()
 
                 if key == "rpcuser" and not hasUser:
                     defaultUser = val
@@ -300,20 +343,20 @@ def ensureNamecoinOptions ():
                     defaultPass = val
                 if key == "rpcport":
                     defaults.namecoinDefaultRpcPort = val
-                
-        nmc.close ()
+
+        nmc.close()
     except IOError:
         logger.error("%s unreadable or missing, Namecoin support deactivated", nmcConfig)
-    except Exception as exc:
+    except Exception:
         logger.warning("Error processing namecoin.conf", exc_info=True)
 
     # If still nothing found, set empty at least.
-    if (not hasUser):
-        BMConfigParser().set (configSection, "namecoinrpcuser", defaultUser)
-    if (not hasPass):
-        BMConfigParser().set (configSection, "namecoinrpcpassword", defaultPass)
+    if not hasUser:
+        BMConfigParser().set(configSection, "namecoinrpcuser", defaultUser)
+    if not hasPass:
+        BMConfigParser().set(configSection, "namecoinrpcpassword", defaultPass)
 
     # Set default port now, possibly to found value.
-    if (not hasPort):
-        BMConfigParser().set (configSection, "namecoinrpcport",
-                           defaults.namecoinDefaultRpcPort)
+    if not hasPort:
+        BMConfigParser().set(configSection, "namecoinrpcport",
+                             defaults.namecoinDefaultRpcPort)

src/pyelliptic/ecc.py

@@ -16,28 +16,28 @@ class ECC:
     Asymmetric encryption with Elliptic Curve Cryptography (ECC)
     ECDH, ECDSA and ECIES
 
-        import pyelliptic
+        >>> import pyelliptic
 
-        alice = pyelliptic.ECC() # default curve: sect283r1
-        bob = pyelliptic.ECC(curve='sect571r1')
+        >>> alice = pyelliptic.ECC() # default curve: sect283r1
+        >>> bob = pyelliptic.ECC(curve='sect571r1')
 
-        ciphertext = alice.encrypt("Hello Bob", bob.get_pubkey())
-        print bob.decrypt(ciphertext)
+        >>> ciphertext = alice.encrypt("Hello Bob", bob.get_pubkey())
+        >>> print bob.decrypt(ciphertext)
 
-        signature = bob.sign("Hello Alice")
-        # alice's job :
-        print pyelliptic.ECC(
-            pubkey=bob.get_pubkey()).verify(signature, "Hello Alice")
+        >>> signature = bob.sign("Hello Alice")
+        >>> # alice's job :
+        >>> print pyelliptic.ECC(
+        >>>     pubkey=bob.get_pubkey()).verify(signature, "Hello Alice")
 
-        # ERROR !!!
-        try:
-            key = alice.get_ecdh_key(bob.get_pubkey())
-        except: print("For ECDH key agreement,\
-                      the keys must be defined on the same curve !")
+        >>> # ERROR !!!
+        >>> try:
+        >>>     key = alice.get_ecdh_key(bob.get_pubkey())
+        >>> except:
+        >>>     print("For ECDH key agreement, the keys must be defined on the same curve !")
 
-        alice = pyelliptic.ECC(curve='sect571r1')
-        print alice.get_ecdh_key(bob.get_pubkey()).encode('hex')
-        print bob.get_ecdh_key(alice.get_pubkey()).encode('hex')
+        >>> alice = pyelliptic.ECC(curve='sect571r1')
+        >>> print alice.get_ecdh_key(bob.get_pubkey()).encode('hex')
+        >>> print bob.get_ecdh_key(alice.get_pubkey()).encode('hex')
 
     """
     def __init__(self, pubkey=None, privkey=None, pubkey_x=None,

src/socks/__init__.py

@@ -5,14 +5,15 @@ Copyright 2006 Dan-Haim. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-3. Neither the name of Dan Haim nor the names of his contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
+
+ 1. Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ 3. Neither the name of Dan Haim nor the names of his contributors may be used
+    to endorse or promote products derived from this software without specific
+    prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -146,19 +147,32 @@ class socksocket(socket.socket):
     def setproxy(self, proxytype=None, addr=None, port=None, rdns=True, username=None, password=None):
         """setproxy(proxytype, addr[, port[, rdns[, username[, password]]]])
         Sets the proxy to be used.
-        proxytype -    The type of the proxy to be used. Three types
-                are supported: PROXY_TYPE_SOCKS4 (including socks4a),
-                PROXY_TYPE_SOCKS5 and PROXY_TYPE_HTTP
-        addr -        The address of the server (IP or DNS).
-        port -        The port of the server. Defaults to 1080 for SOCKS
-                servers and 8080 for HTTP proxy servers.
-        rdns -        Should DNS queries be preformed on the remote side
-                (rather than the local side). The default is True.
-                Note: This has no effect with SOCKS4 servers.
-        username -    Username to authenticate with to the server.
-                The default is no authentication.
-        password -    Password to authenticate with to the server.
-                Only relevant when username is also provided.
+
+         proxytype
+           The type of the proxy to be used. Three types
+           are supported: PROXY_TYPE_SOCKS4 (including socks4a),
+           PROXY_TYPE_SOCKS5 and PROXY_TYPE_HTTP
+
+        addr
+           The address of the server (IP or DNS).
+
+        port
+           The port of the server. Defaults to 1080 for SOCKS
+           servers and 8080 for HTTP proxy servers.
+
+        rdns
+           Should DNS queries be preformed on the remote side
+           (rather than the local side). The default is True.
+           Note: This has no effect with SOCKS4 servers.
+
+        username
+           Username to authenticate with to the server.
+           The default is no authentication.
+
+        password
+           Password to authenticate with to the server.
+           Only relevant when username is also provided.
+
         """
         self.__proxy = (proxytype, addr, port, rdns, username, password)
 
@@ -207,7 +221,7 @@ class socksocket(socket.socket):
                 raise Socks5AuthError((2, _socks5autherrors[2]))
             else:
                 raise GeneralProxyError((1, _generalerrors[1]))
-                
+
     def __connectsocks5(self, destaddr, destport):
         # Now we can request the actual connection
         req = struct.pack('BBB', 0x05, 0x01, 0x00)
@@ -286,7 +300,7 @@ class socksocket(socket.socket):
             raise GeneralProxyError((1,_generalerrors[1]))
         boundport = struct.unpack(">H", self.__recvall(2))[0]
         return ip
-    
+
     def getproxysockname(self):
         """getsockname() -> address info
         Returns the bound IP address and port number at the proxy.