diff options
| author | Ben Sturmfels <ben@sturm.com.au> | 2021-03-05 23:12:19 +1100 |
|---|---|---|
| committer | Ben Sturmfels <ben@sturm.com.au> | 2021-03-05 23:12:19 +1100 |
| commit | dec47c7102cf0aa3a4debf002928db8e460c0d71 (patch) | |
| tree | 47631fc15c7af172aa699506adf3d76d3a71976c /mediagoblin/gmg_commands/batchaddmedia.py | |
| parent | 5f3a782fef4855e10b7259624a14d8afb0f7be93 (diff) | |
| download | mediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.tar.lz mediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.tar.xz mediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.zip | |
Apply `pyupgrade --py3-plus` to remove Python 2 compatibility code.
Diffstat (limited to 'mediagoblin/gmg_commands/batchaddmedia.py')
| -rw-r--r-- | mediagoblin/gmg_commands/batchaddmedia.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/gmg_commands/batchaddmedia.py b/mediagoblin/gmg_commands/batchaddmedia.py index 88fa3e5a..86c9425f 100644 --- a/mediagoblin/gmg_commands/batchaddmedia.py +++ b/mediagoblin/gmg_commands/batchaddmedia.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function, unicode_literals import csv import os @@ -84,7 +83,7 @@ def batchaddmedia(args): abs_metadata_filename = os.path.abspath(metadata_path) abs_metadata_dir = os.path.dirname(abs_metadata_filename) - all_metadata = open(abs_metadata_filename, 'r') + all_metadata = open(abs_metadata_filename) media_metadata = csv.DictReader(all_metadata) for index, file_metadata in enumerate(media_metadata): if six.PY2: @@ -159,7 +158,7 @@ Metadata was not uploaded.""".format( file_abs_path = os.path.abspath(file_path) try: media_file = open(file_abs_path, 'rb') - except IOError: + except OSError: print(_("""\ FAIL: Local file {filename} could not be accessed. {filename} will not be uploaded.""".format(filename=filename))) |