summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-02-24 10:57:10 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-02-24 10:57:10 +0100
commitb3bf754bc371c60f95fac2b9ad503653022b79d6 (patch)
treef9b011b2ee15a778a970e93377d46c7a4561f4b5
parent2ca83d087d32a4a30597af0e60d7927c64f46153 (diff)
downloadurlgrabber-b3bf754bc371c60f95fac2b9ad503653022b79d6.tar.gz
Drop some unnecessary continuation backslashes
When the expression is already in parentheses, the backslash has no effect.
-rw-r--r--test/munittest.py9
-rw-r--r--urlgrabber/grabber.py29
-rw-r--r--urlgrabber/progress.py2
3 files changed, 19 insertions, 21 deletions
diff --git a/test/munittest.py b/test/munittest.py
index e41d7c9..5fdf6f6 100644
--- a/test/munittest.py
+++ b/test/munittest.py
@@ -556,7 +556,7 @@ class TestLoader:
instance_list = map(testCaseClass, name_list)
description = getattr(testCaseClass, '__doc__') \
or testCaseClass.__name__
- description = (description.splitlines()[0]).strip()
+ description = description.splitlines()[0].strip()
suite = self.suiteClass(instance_list, description)
return suite
@@ -611,8 +611,7 @@ class TestLoader:
return obj.__self__.__class__(obj.__name__)
elif callable(obj):
test = obj()
- if not isinstance(test, unittest.TestCase) and \
- not isinstance(test, unittest.TestSuite):
+ if not isinstance(test, (unittest.TestCase, unittest.TestSuite)):
raise ValueError("calling %s returned %s, not a test" % (obj,test))
return test
else:
@@ -802,8 +801,8 @@ class TextTestRunner:
self.stream.writeln()
if not result.wasSuccessful():
self.stream.write("FAILED (")
- failed, errored, skipped = map(len, \
- (result.failures, result.errors, result.skipped))
+ failed, errored, skipped = map(len,
+ (result.failures, result.errors, result.skipped))
if failed:
self.stream.write("failures=%d" % failed)
if errored:
diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index 82d69dd..550daf9 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -1002,8 +1002,8 @@ class URLGrabberOptions:
if 'async' in kwargs:
self.async_ = self.__dict__.pop('async')
if not self.reget in [None, 'simple', 'check_timestamp']:
- raise URLGrabError(11, _('Illegal reget mode: %s') \
- % (self.reget, ))
+ raise URLGrabError(11, _('Illegal reget mode: %s')
+ % (self.reget,))
def _set_defaults(self):
"""Set all options to their default values.
@@ -1757,8 +1757,8 @@ class PyCurlFileObject(object):
raise err
except HTTPException as e:
- err = URLGrabError(7, _('HTTP Exception (%s) on %s: %s') % \
- (e.__class__.__name__, self.url, e))
+ err = URLGrabError(7, _('HTTP Exception (%s) on %s: %s')
+ % (e.__class__.__name__, self.url, e))
err.url = self.url
raise err
@@ -1779,13 +1779,13 @@ class PyCurlFileObject(object):
if self.append: mode = 'ab'
else: mode = 'wb'
- if DEBUG: DEBUG.info('opening local file "%s" with mode %s' % \
- (self.filename, mode))
+ if DEBUG: DEBUG.info('opening local file "%s" with mode %s'
+ % (self.filename, mode))
try:
self.fo = open(self.filename, mode)
except IOError as e:
- err = URLGrabError(16, _(\
- 'error opening local file from %s, IOError: %s') % (self.url, e))
+ err = URLGrabError(16, _('error opening local file from %s, IOError: %s')
+ % (self.url, e))
err.url = self.url
raise err
@@ -1826,17 +1826,16 @@ class PyCurlFileObject(object):
try:
os.utime(self.filename, (mod_time, mod_time))
except OSError as e:
- err = URLGrabError(16, _(\
- 'error setting timestamp on file %s from %s, OSError: %s')
- % (self.filename, self.url, e))
+ err = URLGrabError(16, _('error setting timestamp on file %s from %s, OSError: %s')
+ % (self.filename, self.url, e))
err.url = self.url
raise err
# re open it
try:
self.fo = open(self.filename, 'r')
except IOError as e:
- err = URLGrabError(16, _(\
- 'error opening file from %s, IOError: %s') % (self.url, e))
+ err = URLGrabError(16, _('error opening file from %s, IOError: %s')
+ % (self.url, e))
err.url = self.url
raise err
@@ -2534,7 +2533,7 @@ class _TH:
def _main_test():
try: url, filename = sys.argv[1:3]
except ValueError:
- print('usage:', sys.argv[0], \
+ print('usage:', sys.argv[0],
'<url> <filename> [copy_local=0|1] [close_connection=0|1]')
sys.exit()
@@ -2560,7 +2559,7 @@ def _main_test():
def _retry_test():
try: url, filename = sys.argv[1:3]
except ValueError:
- print('usage:', sys.argv[0], \
+ print('usage:', sys.argv[0],
'<url> <filename> [copy_local=0|1] [close_connection=0|1]')
sys.exit()
diff --git a/urlgrabber/progress.py b/urlgrabber/progress.py
index 1cf29d2..5b4c450 100644
--- a/urlgrabber/progress.py
+++ b/urlgrabber/progress.py
@@ -665,7 +665,7 @@ class RateEstimator:
# First update, on reget is the file size
if self.last_amount_read:
self.last_update_time = now
- self.ave_rate = self._temporal_rolling_ave(\
+ self.ave_rate = self._temporal_rolling_ave(
time_diff, read_diff, self.ave_rate, self.timescale)
self.last_amount_read = amount_read
#print 'results', time_diff, read_diff, self.ave_rate