aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mediagoblin/auth/lib.py1
-rw-r--r--mediagoblin/edit/views.py8
-rw-r--r--mediagoblin/gmg_commands/dbupdate.py3
-rw-r--r--mediagoblin/gmg_commands/import_export.py6
-rw-r--r--mediagoblin/meddleware/csrf.py3
-rw-r--r--mediagoblin/media_types/audio/processing.py2
-rw-r--r--mediagoblin/storage/__init__.py2
-rw-r--r--mediagoblin/storage/cloudfiles.py3
-rw-r--r--mediagoblin/storage/mountstorage.py6
-rw-r--r--mediagoblin/tests/test_csrf_middleware.py5
-rw-r--r--mediagoblin/tests/test_processing.py2
-rw-r--r--mediagoblin/tests/test_submission.py3
-rw-r--r--mediagoblin/tests/test_tags.py1
-rw-r--r--mediagoblin/tests/test_workbench.py1
14 files changed, 14 insertions, 32 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index ddb58fe6..c5b046d2 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.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/>.
-import os
import random
import bcrypt
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 2bcb5694..60a4cb5b 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -14,10 +14,7 @@
# 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/>.
-import uuid
-
from webob import exc
-from string import split
from cgi import FieldStorage
from datetime import datetime
@@ -33,9 +30,7 @@ from mediagoblin.decorators import require_active_login, get_user_media_entry
from mediagoblin.tools.response import render_to_response, redirect
from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.text import (
- clean_html, convert_to_tag_list_of_dicts,
- media_tags_as_string)
-from mediagoblin.tools.licenses import SUPPORTED_LICENSES
+ convert_to_tag_list_of_dicts, media_tags_as_string)
from mediagoblin.db.util import check_media_slug_used
@@ -185,7 +180,6 @@ def edit_profile(request):
@require_active_login
def edit_account(request):
- edit_username = request.GET.get('username')
user = request.user
form = forms.EditAccountForm(request.POST)
diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index 5415b997..dc36be82 100644
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -17,8 +17,7 @@
from sqlalchemy.orm import sessionmaker
from mediagoblin.db.sql.open import setup_connection_and_db_from_config
-from mediagoblin.db.sql.util import (
- MigrationManager, assure_migrations_table_setup)
+from mediagoblin.db.sql.util import MigrationManager
from mediagoblin.init import setup_global_and_app_config
from mediagoblin.tools.common import import_component
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index 9d79afb4..72ebd8a8 100644
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -61,8 +61,7 @@ def _import_media(db, args):
args._cache_path['media'])
# TODO: Add import of queue files
- queue_cache = BasicFileStorage(
- args._cache_path['queue'])
+ queue_cache = BasicFileStorage(args._cache_path['queue'])
for entry in db.MediaEntry.find():
for name, path in entry.media_files.items():
@@ -203,8 +202,7 @@ def _export_media(db, args):
args._cache_path['media'])
# TODO: Add export of queue files
- queue_cache = BasicFileStorage(
- args._cache_path['queue'])
+ queue_cache = BasicFileStorage(args._cache_path['queue'])
for entry in db.MediaEntry.find():
for name, path in entry.media_files.items():
diff --git a/mediagoblin/meddleware/csrf.py b/mediagoblin/meddleware/csrf.py
index 8e8ec7c4..74502dc4 100644
--- a/mediagoblin/meddleware/csrf.py
+++ b/mediagoblin/meddleware/csrf.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/>.
-import hashlib
import random
import logging
@@ -81,7 +80,7 @@ class CsrfMeddleware(BaseMeddleware):
request.environ['CSRF_TOKEN'] = \
request.cookies[mg_globals.app_config['csrf_cookie_name']]
- except KeyError, e:
+ except KeyError:
# if it doesn't exist, make a new one
request.environ['CSRF_TOKEN'] = self._make_token(request)
diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py
index ef98e533..558a37f0 100644
--- a/mediagoblin/media_types/audio/processing.py
+++ b/mediagoblin/media_types/audio/processing.py
@@ -78,7 +78,7 @@ def process_audio(entry):
webm_audio_tmp.name,
quality=audio_config['quality'])
- data = transcoder.discover(webm_audio_tmp.name)
+ transcoder.discover(webm_audio_tmp.name)
_log.debug('Saving medium...')
mgg.public_store.get_file(webm_audio_filepath, 'wb').write(
diff --git a/mediagoblin/storage/__init__.py b/mediagoblin/storage/__init__.py
index e7ea1aa5..3df56c2e 100644
--- a/mediagoblin/storage/__init__.py
+++ b/mediagoblin/storage/__init__.py
@@ -14,9 +14,7 @@
# 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/>.
-import os
import shutil
-import urlparse
import uuid
from werkzeug.utils import secure_filename
diff --git a/mediagoblin/storage/cloudfiles.py b/mediagoblin/storage/cloudfiles.py
index c800005f..ce517932 100644
--- a/mediagoblin/storage/cloudfiles.py
+++ b/mediagoblin/storage/cloudfiles.py
@@ -73,8 +73,7 @@ class CloudFilesStorage(StorageInterface):
def file_exists(self, filepath):
try:
- object = self.container.get_object(
- self._resolve_filepath(filepath))
+ self.container.get_object( self._resolve_filepath(filepath))
return True
except cloudfiles.errors.NoSuchObject:
return False
diff --git a/mediagoblin/storage/mountstorage.py b/mediagoblin/storage/mountstorage.py
index 3fdf4ef0..dffc619b 100644
--- a/mediagoblin/storage/mountstorage.py
+++ b/mediagoblin/storage/mountstorage.py
@@ -17,6 +17,10 @@
from mediagoblin.storage import StorageInterface, clean_listy_filepath
+class MountError(Exception):
+ pass
+
+
class MountStorage(StorageInterface):
"""
Experimental "Mount" virtual Storage Interface
@@ -105,7 +109,7 @@ class MountStorage(StorageInterface):
def resolve_to_backend(self, filepath):
backend, filepath = self._resolve_to_backend(filepath)
if backend is None:
- raise Error("Path not mounted")
+ raise MountError("Path not mounted")
return backend, filepath
def __repr__(self, table=None, indent=[]):
diff --git a/mediagoblin/tests/test_csrf_middleware.py b/mediagoblin/tests/test_csrf_middleware.py
index f49dc94e..ad433fe8 100644
--- a/mediagoblin/tests/test_csrf_middleware.py
+++ b/mediagoblin/tests/test_csrf_middleware.py
@@ -14,11 +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/>.
-import urlparse
-import datetime
-
-from nose.tools import assert_equal
-
from mediagoblin.tests.tools import setup_fresh_app
from mediagoblin import mg_globals
diff --git a/mediagoblin/tests/test_processing.py b/mediagoblin/tests/test_processing.py
index 417f91f3..fe8489aa 100644
--- a/mediagoblin/tests/test_processing.py
+++ b/mediagoblin/tests/test_processing.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-from nose.tools import assert_equal, assert_true, assert_false
+from nose.tools import assert_equal
from mediagoblin import processing
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index 8d1b3745..bf1b87aa 100644
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -16,9 +16,8 @@
import urlparse
import os
-import re
-from nose.tools import assert_equal, assert_true, assert_false
+from nose.tools import assert_equal, assert_true
from pkg_resources import resource_filename
from mediagoblin.tests.tools import get_test_app, \
diff --git a/mediagoblin/tests/test_tags.py b/mediagoblin/tests/test_tags.py
index 79f925aa..bc657660 100644
--- a/mediagoblin/tests/test_tags.py
+++ b/mediagoblin/tests/test_tags.py
@@ -15,7 +15,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin.tests.tools import setup_fresh_app
-from mediagoblin import mg_globals
from mediagoblin.tools import text
@setup_fresh_app
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index b5243a9b..04a74653 100644
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -17,7 +17,6 @@
import os
import tempfile
-from nose.tools import assert_raises
from mediagoblin import workbench
from mediagoblin.tests.test_storage import get_tmp_filestorage
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-11 02:06:25 +0000