summaryrefslogtreecommitdiffabout
authorWojciech Polak <polak@gnu.org>2019-09-20 17:29:15 (GMT)
committer Wojciech Polak <polak@gnu.org>2019-09-20 17:29:15 (GMT)
commitfa8f68aea0ef124d64b239ae4c1adc65456db164 (patch) (side-by-side diff)
treeb925501c7636e34f017927b00f8ed2ba962e3c3a
parentaf816375c950404d8c36665f000d3875e883ed0a (diff)
downloadglifestream-master.tar.gz
glifestream-master.tar.bz2
PEP8 fixesHEADmaster
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.editorconfig16
-rw-r--r--.pylintrc571
-rw-r--r--.vscode/settings.json16
-rw-r--r--glifestream/apis/mail.py6
-rw-r--r--glifestream/apis/twitter.py2
-rw-r--r--glifestream/filters/expand.py18
-rw-r--r--glifestream/filters/twyntax.py1
-rw-r--r--glifestream/gauth/admin.py1
-rw-r--r--glifestream/gauth/views.py6
-rw-r--r--glifestream/stream/admin.py5
-rw-r--r--glifestream/stream/templatetags/gls_filters.py35
-rw-r--r--glifestream/stream/views.py4
-rw-r--r--glifestream/urls.py7
-rw-r--r--glifestream/usettings/urls.py6
-rw-r--r--glifestream/usettings/views.py10
-rw-r--r--glifestream/utils/html.py19
-rw-r--r--glifestream/wsgi.py3
-rw-r--r--glifestream/wsgi.virtualenv.py3
-rw-r--r--requirements.txt1
-rwxr-xr-xworker.py28
20 files changed, 694 insertions, 64 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..087a03b
--- a/dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.html]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000..111c68c
--- a/dev/null
+++ b/.pylintrc
@@ -0,0 +1,571 @@
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code.
+extension-pkg-whitelist=
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the blacklist. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
+jobs=1
+
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Specify a configuration file.
+#rcfile=
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages.
+suggestion-mode=yes
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once). You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=print-statement,
+ parameter-unpacking,
+ unpacking-in-except,
+ old-raise-syntax,
+ backtick,
+ long-suffix,
+ old-ne-operator,
+ old-octal-literal,
+ import-star-module-level,
+ non-ascii-bytes-literal,
+ raw-checker-failed,
+ bad-inline-option,
+ locally-disabled,
+ file-ignored,
+ suppressed-message,
+ useless-suppression,
+ deprecated-pragma,
+ use-symbolic-message-instead,
+ apply-builtin,
+ basestring-builtin,
+ buffer-builtin,
+ cmp-builtin,
+ coerce-builtin,
+ execfile-builtin,
+ file-builtin,
+ long-builtin,
+ raw_input-builtin,
+ reduce-builtin,
+ standarderror-builtin,
+ unicode-builtin,
+ xrange-builtin,
+ coerce-method,
+ delslice-method,
+ getslice-method,
+ setslice-method,
+ no-absolute-import,
+ old-division,
+ dict-iter-method,
+ dict-view-method,
+ next-method-called,
+ metaclass-assignment,
+ indexing-exception,
+ raising-string,
+ reload-builtin,
+ oct-method,
+ hex-method,
+ nonzero-method,
+ cmp-method,
+ input-builtin,
+ round-builtin,
+ intern-builtin,
+ unichr-builtin,
+ map-builtin-not-iterating,
+ zip-builtin-not-iterating,
+ range-builtin-not-iterating,
+ filter-builtin-not-iterating,
+ using-cmp-argument,
+ eq-without-hash,
+ div-method,
+ idiv-method,
+ rdiv-method,
+ exception-message-attribute,
+ invalid-str-codec,
+ sys-max-int,
+ bad-python3-import,
+ deprecated-string-function,
+ deprecated-str-translate-call,
+ deprecated-itertools-function,
+ deprecated-types-field,
+ next-method-defined,
+ dict-items-not-iterating,
+ dict-keys-not-iterating,
+ dict-values-not-iterating,
+ deprecated-operator-function,
+ deprecated-urllib-function,
+ xreadlines-attribute,
+ deprecated-sys-function,
+ exception-escape,
+ comprehension-escape,
+ missing-docstring
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
+
+
+[REPORTS]
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details.
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages.
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit
+
+
+[BASIC]
+
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
+
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style.
+#argument-rgx=
+
+# Naming style matching correct attribute names.
+attr-naming-style=snake_case
+
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style.
+#attr-rgx=
+
+# Bad variable names which should always be refused, separated by a comma.
+bad-names=foo,
+ bar,
+ baz,
+ toto,
+ tutu,
+ tata
+
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style.
+#class-attribute-rgx=
+
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
+# Regular expression matching correct class names. Overrides class-naming-
+# style.
+#class-rgx=
+
+# Naming style matching correct constant names.
+const-naming-style=UPPER_CASE
+
+# Regular expression matching correct constant names. Overrides const-naming-
+# style.
+#const-rgx=
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming style matching correct function names.
+function-naming-style=snake_case
+
+# Regular expression matching correct function names. Overrides function-
+# naming-style.
+#function-rgx=
+
+# Good variable names which should always be accepted, separated by a comma.
+good-names=i,
+ j,
+ k,
+ ex,
+ Run,
+ _
+
+# Include a hint for the correct naming format with invalid-name.
+include-naming-hint=no
+
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style.
+#inlinevar-rgx=
+
+# Naming style matching correct method names.
+method-naming-style=snake_case
+
+# Regular expression matching correct method names. Overrides method-naming-
+# style.
+#method-rgx=
+
+# Naming style matching correct module names.
+module-naming-style=snake_case
+
+# Regular expression matching correct module names. Overrides module-naming-
+# style.
+#module-rgx=
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+# These decorators are taken in consideration only for invalid-name.
+property-classes=abc.abstractproperty
+
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
+
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style.
+#variable-rgx=
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+ XXX,
+ TODO
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string=' '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module.
+max-module-lines=1000
+
+# List of optional constructs for which whitespace checking is disabled. `dict-
+# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}.
+# `trailing-comma` allows a space between comma and closing bracket: (a, ).
+# `empty-line` allows space-only lines.
+no-space-check=trailing-comma,
+ dict-separator
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[LOGGING]
+
+# Format style used to check logging format string. `old` means using %
+# formatting, while `new` is for `{}` formatting.
+logging-format-style=old
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
+
+
+[STRING]
+
+# This flag controls whether the implicit-str-concat-in-sequence should
+# generate a warning on implicit string concatenation in sequences defined over
+# several lines.
+check-str-concat-over-line-jumps=no
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+ _cb
+
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore.
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
+# Spelling dictionary name. Available dictionaries: none. To make it working
+# install python-enchant package..
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to indicated private dictionary in
+# --spelling-private-dict-file option instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis. It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+
+[IMPORTS]
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=optparse,tkinter.tix
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled).
+ext-import-graph=
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled).
+import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled).
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+ __new__,
+ setUp
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,
+ _fields,
+ _replace,
+ _source,
+ _make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=cls
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method.
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in an if statement.
+max-bool-expr=5
+
+# Maximum number of branch for function / method body.
+max-branches=12
+
+# Maximum number of locals for function / method body.
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body.
+max-returns=6
+
+# Maximum number of statements in function / method body.
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "BaseException, Exception".
+overgeneral-exceptions=BaseException,
+ Exception
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..204f7c4
--- a/dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,16 @@
+{
+ "python.pythonPath": "bin/python",
+ "editor.tabCompletion": "on",
+ "workbench.editor.labelFormat": "short",
+ "files.exclude": {
+ "**/*.pyc": {"when": "$(basename).py"},
+ "**/__pycache__": true
+ },
+ "cSpell.enabledLanguageIds": [
+ "markdown",
+ "plaintext",
+ "text"
+ ],
+ "python.linting.enabled": true,
+ "python.linting.pylintEnabled": true
+}
diff --git a/glifestream/apis/mail.py b/glifestream/apis/mail.py
index 515f224..ebb59ab 100644
--- a/glifestream/apis/mail.py
+++ b/glifestream/apis/mail.py
@@ -60,9 +60,9 @@ class API:
args['content'] = part.get_payload(decode=True)
if attach or \
- t.startswith ('image/') or \
- t.startswith ('audio/') or \
- t.startswith ('video/') or \
+ t.startswith('image/') or \
+ t.startswith('audio/') or \
+ t.startswith('video/') or \
t.startswith('application/'):
payload = part.get_payload(decode=True)
os.umask(0)
diff --git a/glifestream/apis/twitter.py b/glifestream/apis/twitter.py
index 61f1701..1774acb 100644
--- a/glifestream/apis/twitter.py
+++ b/glifestream/apis/twitter.py
@@ -108,7 +108,7 @@ class API:
strip_entities(strip_tags(ent['text'])), max_length=40)
e.title = e.title.replace('#', '').replace('@', '')
- e.link = 'https://twitter.com/%s/status/%s' % \
+ e.link = 'https://twitter.com/%s/status/%s' % \
(ent['user']['screen_name'], ent['id'])
image_url = ent['user']['profile_image_url_https']
e.link_image = media.save_image(image_url, direct_image=False)
diff --git a/glifestream/filters/expand.py b/glifestream/filters/expand.py
index 09e5751..3fcf830 100644
--- a/glifestream/filters/expand.py
+++ b/glifestream/filters/expand.py
@@ -89,7 +89,8 @@ def shortpics(s):
"""Expand short picture-URLs."""
s = re.sub(r'https?://(www\.)?(twitpic\.com)/(\w+)', __sp_twitpic, s)
s = re.sub(r'https?://(instagr\.am)/p/([\w\-]+)/?', __sp_instagram, s)
- s = re.sub(r'https?://(www\.)?(instagram\.com)/p/([\w\-]+)/?', __sp_instagram, s)
+ s = re.sub(
+ r'https?://(www\.)?(instagram\.com)/p/([\w\-]+)/?', __sp_instagram, s)
s = re.sub(r'https?://(yfrog\.com)/(\w+)', __sp_yfrog, s)
s = re.sub(r'https?://(www\.)?flickr\.com/([\w\.\-/]+)', __sp_flickr, s)
return s
@@ -132,7 +133,8 @@ def __sv_vimeo(m):
imgurl = media.save_image(imgurl, downscale=True, size=(320, 180))
return '<table class="vc"><tr><td><div data-id="vimeo-%s" class="play-video"><a href="%s" rel="nofollow">' \
'<img src="%s" width="320" height="180" alt="Vimeo Video" /></a>' \
- '<div class="playbutton"></div></div></td></tr></table>' % (id, link, imgurl)
+ '<div class="playbutton"></div></div></td></tr></table>' % (
+ id, link, imgurl)
else:
return link
@@ -168,7 +170,8 @@ def __sv_dailymotion(m):
imgurl = media.save_image(imgurl)
return '<table class="vc"><tr><td><div data-id="dailymotion-%s" class="play-video"><a href="%s" rel="nofollow">' \
'<img src="%s" width="160" height="120" alt="Dailymotion Video" />' \
- '</a><div class="playbutton"></div></div></td></tr></table>%s' % (id, link, imgurl, rest)
+ '</a><div class="playbutton"></div></div></td></tr></table>%s' % (
+ id, link, imgurl, rest)
def __sv_metacafe(m):
@@ -181,7 +184,8 @@ def __sv_metacafe(m):
imgurl = media.save_image(imgurl)
return '<table class="vc"><tr><td><div data-id="metacafe-%s" class="play-video"><a href="%s" rel="nofollow">' \
'<img src="%s" width="136" height="81" alt="Metacafe Video" /></a>' \
- '<div class="playbutton"></div></div></td></tr></table>%s' % (id, link, imgurl, rest)
+ '<div class="playbutton"></div></div></td></tr></table>%s' % (
+ id, link, imgurl, rest)
def __sv_googlevideo(m):
@@ -191,7 +195,8 @@ def __sv_googlevideo(m):
ltag = rest.find('<') if rest else -1
rest = rest[ltag:] if ltag != -1 else ''
return '<div data-id="googlevideo-%s" class="play-video video-inline">' \
- '<a href="%s" rel="nofollow">Google Video %s</a></div>%s' % (id, link, id, rest)
+ '<a href="%s" rel="nofollow">Google Video %s</a></div>%s' % (
+ id, link, id, rest)
def videolinks(s):
@@ -274,7 +279,8 @@ def __sm_googlemaps(m):
geolat = float(ll[0])
geolng = float(ll[1])
return '<div class="geo"><a href="%s" class="map"><span class="latitude">%.10f</span> ' \
- '<span class="longitude">%.10f</span></a></div>%s' % (link, geolat, geolng, rest)
+ '<span class="longitude">%.10f</span></a></div>%s' % (
+ link, geolat, geolng, rest)
else:
return link
diff --git a/glifestream/filters/twyntax.py b/glifestream/filters/twyntax.py
index 34134c7..40c5a4a 100644
--- a/glifestream/filters/twyntax.py
+++ b/glifestream/filters/twyntax.py
@@ -15,6 +15,7 @@
import re
+
def parse(s, type='twitter'):
from glifestream.stream.templatetags.gls_filters import gls_urlizetrunc
if type == 'twitter':
diff --git a/glifestream/gauth/admin.py b/glifestream/gauth/admin.py
index 6dfbc2b..327ed50 100644
--- a/glifestream/gauth/admin.py
+++ b/glifestream/gauth/admin.py
@@ -21,4 +21,5 @@ class OpenIdAdmin (admin.ModelAdmin):
list_display = ('user', 'identity',)
list_filter = ('user',)
+
admin.site.register(OpenId, OpenIdAdmin)
diff --git a/glifestream/gauth/views.py b/glifestream/gauth/views.py
index 548041d..91c5afc 100644
--- a/glifestream/gauth/views.py
+++ b/glifestream/gauth/views.py
@@ -40,7 +40,8 @@ except ImportError:
def login(request, template_name='login.html',
redirect_field_name=REDIRECT_FIELD_NAME):
- redirect_to = request.GET.get(redirect_field_name, urlresolvers.reverse('index'))
+ redirect_to = request.GET.get(
+ redirect_field_name, urlresolvers.reverse('index'))
if request.method == 'POST':
form = AuthenticationRememberMeForm(data=request.POST,)
@@ -87,7 +88,8 @@ def login(request, template_name='login.html',
def login_friend(request, template_name='registration/login.html',
redirect_field_name=REDIRECT_FIELD_NAME):
- redirect_to = request.GET.get(redirect_field_name, urlresolvers.reverse('index'))
+ redirect_to = request.GET.get(
+ redirect_field_name, urlresolvers.reverse('index'))
if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
redirect_to = settings.BASE_URL + '/'
diff --git a/glifestream/stream/admin.py b/glifestream/stream/admin.py
index 9dc0651..a16769d 100644
--- a/glifestream/stream/admin.py
+++ b/glifestream/stream/admin.py
@@ -25,11 +25,15 @@ from glifestream.stream import media
def deactivate(modeladmin, request, queryset):
queryset.update(active=False)
+
+
deactivate.short_description = _("Deactivate item")
def activate(modeladmin, request, queryset):
queryset.update(active=True)
+
+
activate.short_description = _("Activate item")
@@ -104,6 +108,7 @@ class ListAdmin(admin.ModelAdmin):
list_display = ('user', 'name',)
list_filter = ('user',)
+
admin.site.register(Service, ServiceAdmin)
admin.site.register(Entry, EntryAdmin)
admin.site.register(Media, MediaAdmin)
diff --git a/glifestream/stream/templatetags/gls_filters.py b/glifestream/stream/templatetags/gls_filters.py
index 6d69672..e6c3396 100644
--- a/glifestream/stream/templatetags/gls_filters.py
+++ b/glifestream/stream/templatetags/gls_filters.py
@@ -13,31 +13,30 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
-from django import template
-register = template.Library()
-
-import re
-import math
-import time
-import datetime
import calendar
-from django.conf import settings
-from django.utils.encoding import force_text
-from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext as _
-from django.utils.translation import ungettext
-from django.template.defaultfilters import date as ddate
+import datetime
+import time
+import math
+import re
from django.template.defaultfilters import urlencode, stringfilter
-from glifestream.utils.html import urlize as _urlize
-from glifestream.utils.slugify import slugify
-from glifestream.stream import media
+from django.template.defaultfilters import date as ddate
+from django.utils.translation import ungettext
+from django.utils.translation import ugettext as _
+from django.utils.safestring import mark_safe
+from django.utils.encoding import force_text
+from django import template
from glifestream.apis import *
+from glifestream.stream import media
+from glifestream.utils.slugify import slugify
+from glifestream.utils.html import urlize as _urlize
try:
import json
except ImportError:
import simplejson as json
+register = template.Library()
+
@register.filter
def gls_date(date):
@@ -152,11 +151,11 @@ def get_relative_time(t):
rel = _('%d days ago') % rel
elif diff_minutes > 60:
rel = int(math.floor(diff_minutes / 60))
- rel = ungettext ('%(count)d hour ago', '%(count)d hours ago', rel) % \
+ rel = ungettext('%(count)d hour ago', '%(count)d hours ago', rel) % \
{'count': rel, }
else:
rel = int(diff_minutes)
- rel = ungettext ('%(count)d minute ago', '%(count)d minutes ago', rel) % \
+ rel = ungettext('%(count)d minute ago', '%(count)d minutes ago', rel) % \
{'count': rel, }
return rel
diff --git a/glifestream/stream/views.py b/glifestream/stream/views.py
index aef16d8..7a2e36a 100644
--- a/glifestream/stream/views.py
+++ b/glifestream/stream/views.py
@@ -428,7 +428,7 @@ def index(request, **args):
fs = {}
if not authed or page['ctx'] == 'public':
fs['public'] = True
- _classes = Service.objects.filter (**fs).order_by ('id')\
+ _classes = Service.objects.filter(**fs).order_by('id')\
.values('api', 'cls')
classes = {}
for item in _classes:
@@ -504,7 +504,7 @@ def api(request, **args):
Entry.objects.filter(id=int(entry)).update(active=True)
elif cmd == 'gsc': # get selfposts classes
- _srvs = Service.objects.filter (api='selfposts')\
+ _srvs = Service.objects.filter(api='selfposts')\
.order_by('cls').values('id', 'cls')
srvs = {}
for item in _srvs:
diff --git a/glifestream/urls.py b/glifestream/urls.py
index c65d14e..7727969 100644
--- a/glifestream/urls.py
+++ b/glifestream/urls.py
@@ -18,10 +18,11 @@ from django.conf.urls import url, include
from django.contrib import admin
from django.contrib.auth.views import logout
from django.views.static import serve as static_serve
-admin.autodiscover()
-
-from glifestream.stream import views as sv
from glifestream.gauth.views import login
+from glifestream.stream import views as sv
+
+
+admin.autodiscover()
handler404 = 'glifestream.stream.views.page_not_found'
diff --git a/glifestream/usettings/urls.py b/glifestream/usettings/urls.py
index e449a5e..2b3aa8b 100644
--- a/glifestream/usettings/urls.py
+++ b/glifestream/usettings/urls.py
@@ -18,7 +18,8 @@ from django.views.generic.base import RedirectView
from glifestream.usettings import views
urlpatterns = [
- url(r'^$', RedirectView.as_view(url='services', permanent=False), name='settings'),
+ url(r'^$', RedirectView.as_view(
+ url='services', permanent=False), name='settings'),
url(r'api/(?P<cmd>[a-z\-]+)$', views.api),
url(r'services$', views.services, name='usettings-services'),
url(r'services/import$', views.opml, {
@@ -26,7 +27,8 @@ urlpatterns = [
url(r'services/export$', views.opml, {
'cmd': 'export'}, 'opml-export'),
url(r'lists$', views.lists, name='usettings-lists'),
- url(r'lists/(?P<list>[a-z0-9\-]+)$', views.lists, name='usettings-lists-slug'),
+ url(r'lists/(?P<list>[a-z0-9\-]+)$',
+ views.lists, name='usettings-lists-slug'),
url(r'pshb$', views.pshb, name='usettings-pshb'),
url(r'openid$', views.openid, name='usettings-openid'),
url(r'tools$', views.tools, name='usettings-tools'),
diff --git a/glifestream/usettings/views.py b/glifestream/usettings/views.py
index f05af2c..b7705e6 100644
--- a/glifestream/usettings/views.py
+++ b/glifestream/usettings/views.py
@@ -167,7 +167,7 @@ def pshb(request, **args):
page['msg'] = 'Hub %s: %s.' % (r['hub'], r['rc'])
subs = gls_pshb.list(raw=True)
- services = Service.objects.exclude (api__in=excluded_apis) \
+ services = Service.objects.exclude(api__in=excluded_apis) \
.exclude(id__in=subs.values('service__id')).order_by('name')
return render_to_response('pshb.html', {'page': page, 'authed': authed,
@@ -350,18 +350,18 @@ def opml(request, **args):
tp = e.getAttribute('type')
if tp == 'rss':
xml_url = e.getAttribute('xmlUrl')
- title = e.getAttribute ('text') or \
+ title = e.getAttribute('text') or \
e.getAttribute('title')
_import_service(xml_url, title)
elif not tp:
- cls = e.getAttribute ('text') or \
+ cls = e.getAttribute('text') or \
e.getAttribute('title')
cls = cls.lower()
for f in e.childNodes:
if f.nodeName == 'outline' and \
f.getAttribute('type') == 'rss':
xml_url = f.getAttribute('xmlUrl')
- title = f.getAttribute ('text') or \
+ title = f.getAttribute('text') or \
f.getAttribute('title')
_import_service(xml_url, title, cls)
@@ -370,7 +370,7 @@ def opml(request, **args):
elif cmd == 'export':
excluded_apis = ('selfposts', 'fb')
- services = Service.objects.exclude (api__in=excluded_apis) \
+ services = Service.objects.exclude(api__in=excluded_apis) \
.order_by('name')
srvs = []
diff --git a/glifestream/utils/html.py b/glifestream/utils/html.py
index 9ff2658..d37780e 100644
--- a/glifestream/utils/html.py
+++ b/glifestream/utils/html.py
@@ -60,17 +60,20 @@ def strip_entities(value):
strip_entities = allow_lazy(strip_entities, six.text_type)
-##
-## Code taken from Django 1.7
-##
+#
+# Code taken from Django 1.7
+#
TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)', '"', '\'']
-WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'), ('&lt;', '&gt;'), ('"', '"'), ('\'', '\'')]
+WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'),
+ ('&lt;', '&gt;'), ('"', '"'), ('\'', '\'')]
word_split_re = re.compile(r'(\s+)')
simple_url_re = re.compile(r'^https?://\[?\w', re.IGNORECASE)
-simple_url_2_re = re.compile(r'^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org)$', re.IGNORECASE)
+simple_url_2_re = re.compile(
+ r'^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org)$', re.IGNORECASE)
simple_email_re = re.compile(r'^\S+@\S+\.\S+$')
+
def smart_urlquote(url):
"Quotes a URL if it isn't already quoted."
# Handle IDN before quoting.
@@ -91,6 +94,7 @@ def smart_urlquote(url):
return force_text(url)
+
def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
"""
Converts any URLs in text into clickable links.
@@ -154,7 +158,8 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
if autoescape and not safe_input:
lead, trail = escape(lead), escape(trail)
url, trimmed = escape(url), escape(trimmed)
- middle = '<a href="%s"%s>%s</a>' % (url, nofollow_attr, trimmed)
+ middle = '<a href="%s"%s>%s</a>' % (url,
+ nofollow_attr, trimmed)
words[i] = mark_safe('%s%s%s' % (lead, middle, trail))
else:
if safe_input:
@@ -166,4 +171,6 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
elif autoescape:
words[i] = escape(word)
return ''.join(words)
+
+
urlize = allow_lazy(urlize, six.text_type)
diff --git a/glifestream/wsgi.py b/glifestream/wsgi.py
index a1825a1..9efbcaf 100644
--- a/glifestream/wsgi.py
+++ b/glifestream/wsgi.py
@@ -15,10 +15,11 @@
import os
import sys
+from django.core.wsgi import get_wsgi_application
+
SITE_ROOT = os.path.dirname(os.path.realpath(__file__))
os.environ['DJANGO_SETTINGS_MODULE'] = 'glifestream.settings'
sys.path.insert(0, os.path.join(SITE_ROOT, '../'))
-from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()
diff --git a/glifestream/wsgi.virtualenv.py b/glifestream/wsgi.virtualenv.py
index c9ad02e..7e3d6b7 100644
--- a/glifestream/wsgi.virtualenv.py
+++ b/glifestream/wsgi.virtualenv.py
@@ -15,6 +15,8 @@
import os
import sys
+from django.core.wsgi import get_wsgi_application
+
SITE_ROOT = os.path.dirname(os.path.realpath(__file__))
os.environ['DJANGO_SETTINGS_MODULE'] = 'glifestream.settings'
@@ -24,5 +26,4 @@ execfile(activate_this, dict(__file__=activate_this))
sys.path.insert(0, os.path.join(SITE_ROOT, '../'))
-from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()
diff --git a/requirements.txt b/requirements.txt
index 470a624..e5451b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,3 +10,4 @@ python3-openid ==3.1.*; python_version >= '3.0'
requests-oauthlib ==0.4.*
beautifulsoup4 ==4.3.*
Markdown ==2.6.*
+pylint ==2.3.*
diff --git a/worker.py b/worker.py
index 733ef16..043a2fc 100755
--- a/worker.py
+++ b/worker.py
@@ -16,12 +16,17 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
+import datetime
+import getopt
import os
import sys
import time
-import datetime
-import getopt
+import django
+from django.conf import settings
from django.utils.six.moves import range, input
+from glifestream.stream import media, pshb
+from glifestream.stream.models import Service, Entry, Favorite
+from glifestream.utils.time import unixnow
try:
import workerpool
@@ -31,18 +36,12 @@ except ImportError:
SITE_ROOT = os.path.dirname(os.path.realpath(__file__))
os.environ['DJANGO_SETTINGS_MODULE'] = 'glifestream.settings'
-import django
if hasattr(django, 'setup'):
django.setup()
-from django.conf import settings
-
-from glifestream.utils.time import unixnow
-from glifestream.stream.models import Service, Entry, Favorite
-from glifestream.stream import media, pshb
if workerpool:
- class WorkerJob (workerpool.Job):
+ class WorkerJob(workerpool.Job):
def __init__(self, fn):
self.fn = fn
@@ -229,7 +228,7 @@ def run():
Entry.objects.filter(**fs).exclude(id__in=favs).delete()
sys.exit(0)
else:
- if not force_check or not 'id' in fs:
+ if not force_check or 'id' not in fs:
fs['active'] = True
if force_overwrite:
@@ -239,7 +238,7 @@ def run():
sys.exit(0)
try:
- last1 = Entry.objects.filter (service__public=True).\
+ last1 = Entry.objects.filter(service__public=True).\
order_by('-date_published')[0]
except IndexError:
last1 = None
@@ -274,7 +273,7 @@ def run():
pool.wait()
try:
- last2 = Entry.objects.filter (service__public=True).\
+ last2 = Entry.objects.filter(service__public=True).\
order_by('-date_published')[0]
except IndexError:
last2 = None
@@ -320,8 +319,8 @@ and all have write permissions by your webserver.
if not os.path.isfile(file):
print("Creating empty file '%s'" % file)
open(file, 'w').close()
- except Error as e:
- print(e)
+ except Exception as exc:
+ print(exc)
return 1
return 0
@@ -333,5 +332,6 @@ def _create_dir(d, verbose=True):
print("Creating directory '%s'" % d)
os.mkdir(d)
+
if __name__ == '__main__':
run()

Return to:

Send suggestions and report system problems to the System administrator.