Skip to content

Commit

Permalink
Whitespace fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
lemon24 committed Jun 22, 2019
1 parent d95665d commit 966d54f
Show file tree
Hide file tree
Showing 24 changed files with 14 additions and 44 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ cache:

after_success:
- codecov

1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '__pycache__' -exec rm -rf {} +

1 change: 0 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,3 @@ Usage:
['H.I. #108: Project Cyclops']
.. end-usage
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ help:
# 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)
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
1 change: 0 additions & 1 deletion docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,3 @@ All exceptions that :class:`Reader` explicitly raises inherit from :exc:`ReaderE
:members:

Subclass of :exc:`ReaderError`.

1 change: 0 additions & 1 deletion docs/app.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ Lightweight browsers
:width: 240px

Dillo

1 change: 0 additions & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@

.. include:: ../CHANGES.rst

1 change: 0 additions & 1 deletion docs/cli.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@ Reference
.. click:: reader.cli:cli
:prog: reader
:show-nested:

6 changes: 3 additions & 3 deletions docs/deploying.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ Serving the web application

reader exposes a standard WSGI application as ``reader.app.wsgi:app``.
See the `Flask documentation`_ for more details on how to deploy it.
The path to the reader database can be configured through the ``READER_DB``
The path to the reader database can be configured through the ``READER_DB``
environment variable.

.. warning::

The web application has no authentication / authorization whatsoever;
it is expected a server / middleware will provide that.


An example uWSGI configuration file (probably not idiomatic, from `here`_)::

Expand All @@ -62,7 +62,7 @@ If running on a personal computer, you can use cron to run ``serve`` at boot::

@reboot sleep 60; reader serve -p 8080 2>&1 ) >>"/tmp/$LOGNAME.reader.serve.boot.log"


.. _here: https://github.com/lemon24/owncloud/blob/936b0aa6015eb8b4a42e37ff7dc8df2bae87263d/reader.yaml#L79
.. _Flask documentation: http://flask.pocoo.org/docs/1.0/deploying/
.. _Werkzeug's development server: http://werkzeug.pocoo.org/docs/0.14/serving/#werkzeug.serving.run_simple
3 changes: 0 additions & 3 deletions docs/dev-app.rst
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,3 @@ Pages
~~~~~

Text TBD.



1 change: 0 additions & 1 deletion docs/dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,3 @@ Making a release (from ``x`` to ``y`` == ``x + 1``; ``scripts/release.py`` alrea
.. ---------------
.. include:: dev-app.rst

1 change: 0 additions & 1 deletion docs/plugins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,3 @@ Existing plugins
.. automodule:: reader.plugins.feed_entry_dedupe
.. automodule:: reader.plugins.enclosure_dedupe
.. automodule:: reader.plugins.tumblr_gdpr

1 change: 0 additions & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[pytest]
markers =
slow: mark a test as slow.

1 change: 0 additions & 1 deletion scripts/build-sqlite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ if [ ! -e $build_dir/sqlite/libsqlite3.so.0 ]; then
else
echo "using existing sqlite"
fi

1 change: 0 additions & 1 deletion scripts/jscontrols.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,3 @@
{% endfor %}

<pre id='out'></pre>

1 change: 0 additions & 1 deletion src/reader/app/static/controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,4 +298,3 @@ function extract_form_data(form) {
function update_object(self, other) {
for (var attrname in other) { self[attrname] = other[attrname]; }
}

2 changes: 0 additions & 2 deletions src/reader/app/static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,3 @@ ol ul {
}

/* END Skeleton */


1 change: 0 additions & 1 deletion src/reader/app/templates/entries.html
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,3 @@ <h2><a href="{{ entry.link }}">


{% endblock %}

3 changes: 1 addition & 2 deletions src/reader/app/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<li>
<a href="{{ url_for('.entries') }}">entries</a>
<a href="{{ url_for('.feeds') }}">feeds</a>
{{ macros.text_input_button('.form_api', 'add-feed', 'add feed', 'feed-url', 'feed URL',
{{ macros.text_input_button('.form_api', 'add-feed', 'add feed', 'feed-url', 'feed URL',
next=url_for('.feeds', **request.args)) }}
{% for message in get_flashed_messages_by_prefix('add-feed') %}
<li class="error">{{ message }}
Expand All @@ -49,4 +49,3 @@
<h1>{% block main_title %}{% endblock %}</h1>

{% block body %}{% endblock %}

2 changes: 0 additions & 2 deletions src/reader/app/templates/macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,3 @@
{%- if option != current_option %}</a> {% endif %}
{% endfor %}
{%- endmacro %}


1 change: 0 additions & 1 deletion src/reader/app/templates/metadata.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,3 @@ <h2>{{ key or '""' }}</h2>
{% endfor %}

{% endblock %}

22 changes: 8 additions & 14 deletions src/reader/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ def cli(ctx, db, plugin):
@click.option('-v', '--verbose', count=True)
@click.pass_obj
def add(kwargs, url, update, verbose):
"""Add a new feed.
"""
"""Add a new feed."""
setup_logging(verbose)
reader = make_reader(**kwargs)
reader.add_feed(url)
Expand All @@ -108,9 +106,7 @@ def add(kwargs, url, update, verbose):
@click.option('-v', '--verbose', count=True)
@click.pass_obj
def remove(kwargs, url, verbose):
"""Remove an existing feed.
"""
"""Remove an existing feed."""
setup_logging(verbose)
reader = make_reader(**kwargs)
reader.remove_feed(url)
Expand All @@ -125,9 +121,9 @@ def remove(kwargs, url, verbose):
@click.pass_obj
def update(kwargs, url, new_only, verbose):
"""Update one or all feeds.
If URL is not given, update all the feeds.
"""
setup_logging(verbose)
reader = make_reader(**kwargs)
Expand All @@ -146,9 +142,7 @@ def list():
@list.command()
@click.pass_obj
def feeds(kwargs):
"""List all the feeds.
"""
"""List all the feeds."""
reader = make_reader(**kwargs)
for feed in reader.get_feeds():
click.echo(feed.url)
Expand All @@ -158,11 +152,11 @@ def feeds(kwargs):
@click.pass_obj
def entries(kwargs):
"""List all the entries.
Outputs one line per entry in the following format:
<feed URL> <entry link or id>
"""
reader = make_reader(**kwargs)
for entry in reader.get_entries():
Expand Down
2 changes: 1 addition & 1 deletion src/reader/plugins/feed_entry_dedupe.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Implemented for https://github.com/lemon24/reader/issues/79.
.. todo::
Some possible optimizations:
1. Do this once per feed (now it's one ``get_entries(feed=...)`` per entry).
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ deps = coverage
skip_install = true
commands =
coverage html

0 comments on commit 966d54f

Please sign in to comment.