Skip to content

Commit

Permalink
Fix lint errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
JPJPJPOPOP committed Jan 7, 2018
1 parent 709b3e5 commit ac2cbda
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[flake8]
max-line-length = 180
exclude = toro.py
exclude = toro.py, streamparser
9 changes: 5 additions & 4 deletions gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ def get(self):
logging.info('Redirecting %s?%s to %s%s?%s' % (path, query, server_port, path, query))

http = tornado.httpclient.AsyncHTTPClient()
http.fetch(server_port + path + "?" + query, functools.partial(self._on_download,
(server, port), langPair), validate_cert=verifySSLCert, headers=headers)
http.fetch(server_port + path + "?" + query,
functools.partial(self._on_download, (server, port), langPair),
validate_cert=verifySSLCert, headers=headers)
self.balancer.inform('start', (server, port), url=path)

def _on_download(self, server, langPair, response):
Expand Down Expand Up @@ -318,8 +319,8 @@ def inform(self, action, server, *args, **kwargs):
if mode in self.serverlist:
if action == 'complete':
if self.serverlist[mode][server]:
self.serverlist[mode][server] = (self.serverlist[mode][server] * (self.numResponses -
1) + requestTime / responseLen) / self.numResponses
self.serverlist[mode][server] = ((self.serverlist[mode][server] *
(self.numResponses - 1) + requestTime / responseLen) / self.numResponses)
else:
self.serverlist[mode][server] = requestTime / responseLen / self.numResponses
elif action == 'drop':
Expand Down
17 changes: 11 additions & 6 deletions servlet.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from urllib.parse import urlparse, urlunsplit
import zipfile

from streamparser/streamparser import parse,known
from streamparser.streamparser import parse, known
import tornado
from tornado import escape
from tornado import gen
Expand Down Expand Up @@ -1388,17 +1388,21 @@ def apply_config(args, apySection):
parser.add_argument('-k', '--ssl-key', help='path to SSL Key File', default=None)
parser.add_argument('-t', '--timeout', help='timeout for requests (default = 10)', type=int, default=10)
parser.add_argument('-j', '--num-processes',
help='number of processes to run (default = 1; use 0 to run one http server per core, where each http server runs all available language pairs)',
help='number of processes to run (default = 1; use 0 to run one http server per core,'
' where each http server runs all available language pairs)',
nargs='?', type=int, default=1)
parser.add_argument(
'-d', '--daemon', help='daemon mode: redirects stdout and stderr to files apertium-apy.log and apertium-apy.err ; use with --log-path', action='store_true')
'-d', '--daemon', help='daemon mode: redirects stdout and stderr to files apertium-apy.log'
' and apertium-apy.err ; use with --log-path', action='store_true')
parser.add_argument('-P', '--log-path', help='path to log output files to in daemon mode; defaults to local directory', default='./')
parser.add_argument('-i', '--max-pipes-per-pair',
help='how many pipelines we can spin up per language pair (default = 1)', type=int, default=1)
parser.add_argument('-n', '--min-pipes-per-pair',
help='when shutting down pipelines, keep at least this many open per language pair (default = 0)', type=int, default=0)
help='when shutting down pipelines, keep at least this many'
' open per language pair (default = 0)', type=int, default=0)
parser.add_argument('-u', '--max-users-per-pipe',
help='how many concurrent requests per pipeline before we consider spinning up a new one (default = 5)', type=int, default=5)
help='how many concurrent requests per pipeline before we consider'
' spinning up a new one (default = 5)', type=int, default=5)
parser.add_argument('-m', '--max-idle-secs',
help='if specified, shut down pipelines that have not been used in this many seconds', type=int, default=0)
parser.add_argument('-r', '--restart-pipe-after',
Expand All @@ -1407,7 +1411,8 @@ def apply_config(args, apySection):
parser.add_argument('-V', '--version', help='show APY version', action='version', version="%(prog)s version " + __version__)
parser.add_argument('-S', '--scalemt-logs', help='generates ScaleMT-like logs; use with --log-path; disables', action='store_true')
parser.add_argument('-M', '--unknown-memory-limit',
help="keeps unknown words in memory until a limit is reached; use with --missing-freqs (default = 1000)", type=int, default=1000)
help='keeps unknown words in memory until a limit is reached; use'
' with --missing-freqs (default = 1000)', type=int, default=1000)
parser.add_argument('-T', '--stat-period-max-age',
help='How many seconds back to keep track request timing stats (default = 3600)', type=int, default=3600)
parser.add_argument('-wp', '--wiki-password', help="Apertium Wiki account password for SuggestionHandler", default=None)
Expand Down
3 changes: 2 additions & 1 deletion util.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ def getCoverage(text, mode, modeDir, penalize=False):
if len(lexicalUnits) and not penalize:
return len(analyzedLexicalUnits) / len(lexicalUnits)
elif len(lexicalUnits) and len(text) and penalize:
return len(analyzedLexicalUnits) / len(lexicalUnits) - (1 - sum([len(lexicalUnit[0].split('/')[0]) for lexicalUnit in lexicalUnits]) / len(text))
return (len(analyzedLexicalUnits) / len(lexicalUnits)
- (1 - sum([len(lexicalUnit[0].split('/')[0]) for lexicalUnit in lexicalUnits]) / len(text)))
else:
return -1

Expand Down

0 comments on commit ac2cbda

Please sign in to comment.