diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-13 20:23:26 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-13 20:23:26 -0600 |
| commit | ee91c2b88d1a42b9d15d34d2c081cd8394649041 (patch) | |
| tree | 01a75b958b2814763a0b219145bbe284d1d04931 /mediagoblin/edit | |
| parent | 4671fda345394dad9ca4278b1cf7b2cdf7d2b4ee (diff) | |
| parent | 285ffeddf3542201b83072d3be544c85e9c487c2 (diff) | |
| download | mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.tar.lz mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.tar.xz mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.zip | |
Merge remote-tracking branch 'remotes/nyergler/pep8-ification'
Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/user_pages/views.py
mediagoblin/util.py
Diffstat (limited to 'mediagoblin/edit')
| -rw-r--r-- | mediagoblin/edit/__init__.py | 2 | ||||
| -rw-r--r-- | mediagoblin/edit/views.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mediagoblin/edit/__init__.py b/mediagoblin/edit/__init__.py index 576bd0f5..ba347c69 100644 --- a/mediagoblin/edit/__init__.py +++ b/mediagoblin/edit/__init__.py @@ -13,5 +13,3 @@ # # 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/>. - - diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 17244831..f3ebebe8 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -120,7 +120,7 @@ def edit_attachments(request, media): name=request.POST['attachment_name'] \ or request.POST['attachment_file'].filename, filepath=attachment_public_filepath, - created=datetime.utcnow() + created=datetime.utcnow(), )) media.save() |