mediagoblin.git
9 years agoUnit tests
ayleph [Thu, 18 Sep 2014 05:30:15 +0000 (22:30 -0700)]
Unit tests

Added unit tests for lowercasify username on login.

9 years agoPass validated username to check_login_simple
ayleph [Sun, 3 Aug 2014 22:55:16 +0000 (15:55 -0700)]
Pass validated username to check_login_simple

The login function in mediagoblin/auth/views.py grabs the username prior to
form validation. If validation passes, the pre-validated username is passed to
the check_login_simple function.

Lowercasifying of the username occurs as part of form validation. By sending
the pre-validated username, there's a chance of sending a username with
uppercase letters. This will fail to match any user ids in the database, as
all of the usernames are lowercased during the registration process.

This change sends the post-validated username to check_login_simple, so that
any username that was entered by the user with uppercase letters has a chance
to be properly lowercased before being passed.

9 years agoTemplate hook to allow plugin authors to add extra things to the header
Christopher Allan Webber [Thu, 30 Oct 2014 16:14:59 +0000 (11:14 -0500)]
Template hook to allow plugin authors to add extra things to the header

Thanks to Andrew Browning for requesting this and suggesting where to
put it!

9 years agoFix #1017 - Exception caused by activity being set on incorrect foreign key
Jessica Tallon [Wed, 29 Oct 2014 08:47:09 +0000 (08:47 +0000)]
Fix #1017 - Exception caused by activity being set on incorrect foreign key

The .activity ForeignKey on several models such as MediaEntry expects
a ActivityIntmediatory ID not an Activity ID however in submit code the
activity attribute was being set the Activity, simply removing this
assignment should fix the issue as everything is set correctly at this point.

I have also moved the creation of the activity above the processing of media
to avoid race conditions.

9 years agoFix #1007 - get location object not string of location name; caused 500 when editing...
Jessica Tallon [Mon, 27 Oct 2014 11:11:43 +0000 (11:11 +0000)]
Fix #1007 - get location object not string of location name; caused 500 when editing profile

9 years agoFix #1010 - Typos in mediagoblin/media_types/image/migrations.py
Jessica Tallon [Mon, 27 Oct 2014 09:45:23 +0000 (09:45 +0000)]
Fix #1010 - Typos in mediagoblin/media_types/image/migrations.py

9 years agoFix #1005 - location.position is a dictionary so 'value' in dict check needed
Jessica Tallon [Mon, 27 Oct 2014 09:28:56 +0000 (09:28 +0000)]
Fix #1005 - location.position is a dictionary so 'value' in dict check needed

9 years agoOnly create a slug after a media upload via the API when there is a title
Jessica Tallon [Wed, 22 Oct 2014 20:42:57 +0000 (21:42 +0100)]
Only create a slug after a media upload via the API when there is a title

9 years agoFix problem where duplicate slug would cause an update exception
Jessica Tallon [Wed, 22 Oct 2014 17:59:04 +0000 (18:59 +0100)]
Fix problem where duplicate slug would cause an update exception

9 years agoMerge branch '984-ai-improvements'
Jessica Tallon [Tue, 21 Oct 2014 10:57:15 +0000 (11:57 +0100)]
Merge branch '984-ai-improvements'

9 years agoFix #984 - Improvements to Activity and ActivityIntermediator
Jessica Tallon [Tue, 21 Oct 2014 10:44:11 +0000 (11:44 +0100)]
Fix #984 - Improvements to Activity and ActivityIntermediator

- Add unit tests to cover get and set methods on Activity
- Rewrite the set to remove set and use Session.flush instead
- Use sqlalchemy's validator instead of .save hack

9 years agoairy.css: Override white text in TOS
Meg Ford [Wed, 19 Mar 2014 18:46:25 +0000 (13:46 -0500)]
airy.css: Override white text in TOS

Fixes bug https://issues.mediagoblin.org/ticket/808

9 years agoSomehow Shawn and Sergio got in there twice
Christopher Allan Webber [Wed, 15 Oct 2014 14:32:58 +0000 (09:32 -0500)]
Somehow Shawn and Sergio got in there twice

9 years agoMake a mediagoblin.ini file for the user if needed.
Christopher Allan Webber [Sat, 11 Oct 2014 00:35:09 +0000 (19:35 -0500)]
Make a mediagoblin.ini file for the user if needed.

This is to prevent our docs from confusing people in this
transitionary time period...

9 years agoDo git submodule init and git submodule update in bootstrap.sh
Christopher Allan Webber [Fri, 10 Oct 2014 21:27:06 +0000 (16:27 -0500)]
Do git submodule init and git submodule update in bootstrap.sh

Idea borrowed from guix bootstrap script.

If this proves to not be great we can move it :)

9 years agoBring back the ascii art goblin! For python 2 anyway.
Christopher Allan Webber [Fri, 10 Oct 2014 20:46:08 +0000 (15:46 -0500)]
Bring back the ascii art goblin!  For python 2 anyway.

This does a "friendly" fallback where it skips the middleware on python 3.

9 years agoRemove the paste.ini rule.
Christopher Allan Webber [Fri, 10 Oct 2014 15:21:04 +0000 (10:21 -0500)]
Remove the paste.ini rule.

9 years agoSo, we're not really using AC_CONFIG_MACRO_DIR for now.
Christopher Allan Webber [Fri, 10 Oct 2014 14:41:59 +0000 (09:41 -0500)]
So, we're not really using AC_CONFIG_MACRO_DIR for now.

9 years agoUpdate docs: it's now ./bootstrap.sh, also, you need to get a copy of mediagoblin.ini
Christopher Allan Webber [Fri, 10 Oct 2014 00:28:30 +0000 (19:28 -0500)]
Update docs: it's now ./bootstrap.sh, also, you need to get a copy of mediagoblin.ini

9 years agoClarification on the mediagoblin.ini copying
Christopher Allan Webber [Fri, 10 Oct 2014 00:20:54 +0000 (19:20 -0500)]
Clarification on the mediagoblin.ini copying

9 years agoGive a user a mediagoblin.ini if they don't have one
Christopher Allan Webber [Fri, 10 Oct 2014 00:14:59 +0000 (19:14 -0500)]
Give a user a mediagoblin.ini if they don't have one

9 years agoConditionally give paste or gunicorn help
Christopher Allan Webber [Fri, 10 Oct 2014 00:04:48 +0000 (19:04 -0500)]
Conditionally give paste or gunicorn help

9 years agoMove paste.ini, lazystarter.sh back to the right place
Christopher Allan Webber [Thu, 9 Oct 2014 23:51:05 +0000 (18:51 -0500)]
Move paste.ini, lazystarter.sh back to the right place

9 years agoUse python imports to determine whether or not we're using gunicorn
Christopher Allan Webber [Thu, 9 Oct 2014 23:33:02 +0000 (18:33 -0500)]
Use python imports to determine whether or not we're using gunicorn

This commit sponsored by Andrés Muñiz Piniella.  Thank you!

9 years agoAdd and use paste server selector. Yeah! Smart solutions!
Christopher Allan Webber [Thu, 9 Oct 2014 23:24:14 +0000 (18:24 -0500)]
Add and use paste server selector.  Yeah!  Smart solutions!

This commit sponsored by Tryggvi Björgvinsson.  Thank you!

9 years agoThat's right, *append* to the list, don't call it :P
Christopher Allan Webber [Thu, 9 Oct 2014 20:59:53 +0000 (15:59 -0500)]
That's right, *append* to the list, don't call it :P

9 years agoOnly install gunicorn on py2
Christopher Allan Webber [Thu, 9 Oct 2014 20:48:22 +0000 (15:48 -0500)]
Only install gunicorn on py2

9 years agoAlso remove the include directory
Christopher Allan Webber [Thu, 9 Oct 2014 19:31:58 +0000 (14:31 -0500)]
Also remove the include directory

9 years agoUpdate lazyserver to use paste or gunicorn conditionally
Christopher Allan Webber [Thu, 9 Oct 2014 18:49:15 +0000 (13:49 -0500)]
Update lazyserver to use paste or gunicorn conditionally

Also get rid of env.in, we're not using that for now.

9 years agoVarious makefile fixes
Christopher Allan Webber [Thu, 9 Oct 2014 18:01:22 +0000 (13:01 -0500)]
Various makefile fixes

 - Actually use $(PYTHON) in virtualenv creation
 - Make paste.ini if need be
 - distclean is more forgiving if files aren't there
 - clean up virtualenvs also

9 years agoMoving experimental-bootstrap.sh back to bootstrap.sh
Christopher Allan Webber [Wed, 8 Oct 2014 22:14:42 +0000 (17:14 -0500)]
Moving experimental-bootstrap.sh back to bootstrap.sh

9 years agoNo rule, yet, to clean house.
Christopher Allan Webber [Wed, 8 Oct 2014 22:05:36 +0000 (17:05 -0500)]
No rule, yet, to clean house.

9 years agoUsers now get an editable copy of mediagoblin.example.ini->mediagoblin.ini
Christopher Allan Webber [Wed, 8 Oct 2014 19:59:18 +0000 (14:59 -0500)]
Users now get an editable copy of mediagoblin.example.ini->mediagoblin.ini

This way we no longer have people confusedly editing mediagoblin.ini
when they meant to edit mediagoblin.example.ini.  Hopefully it should be
a lot simpler.

9 years agoIgnore paste.ini because it's just a symlink to the appropriate python
Christopher Allan Webber [Wed, 8 Oct 2014 19:34:52 +0000 (14:34 -0500)]
Ignore paste.ini because it's just a symlink to the appropriate python
version paste

9 years agoSymlink the appropriate paste.ini
Christopher Allan Webber [Wed, 8 Oct 2014 19:34:28 +0000 (14:34 -0500)]
Symlink the appropriate paste.ini

9 years agoSet USE_PYTHON3 to yes/no depending on whether --with-python3 enabled
Christopher Allan Webber [Wed, 8 Oct 2014 18:20:30 +0000 (13:20 -0500)]
Set USE_PYTHON3 to yes/no depending on whether --with-python3 enabled

9 years agoNo acceptable *python* could be found
Christopher Allan Webber [Wed, 8 Oct 2014 18:07:11 +0000 (13:07 -0500)]
No acceptable *python* could be found

9 years agoMoved where the python init command was
Christopher Allan Webber [Wed, 8 Oct 2014 18:03:57 +0000 (13:03 -0500)]
Moved where the python init command was

9 years agoMost of the way to having a desirable `./configure && make` setup
Christopher Allan Webber [Wed, 8 Oct 2014 17:55:44 +0000 (12:55 -0500)]
Most of the way to having a desirable `./configure && make` setup

Tries to simplify a lot of the configure code.  This is mostly because I
found what I expected the previous configure setup to do wasn't quite
what it was doing.

Also supports a --with-python3 option.

9 years agoIgnore that env file when built
Christopher Allan Webber [Sat, 4 Oct 2014 03:58:06 +0000 (22:58 -0500)]
Ignore that env file when built

9 years agoContinuing to iterate toward the right autoconf/make solution
Christopher Allan Webber [Sat, 4 Oct 2014 03:57:24 +0000 (22:57 -0500)]
Continuing to iterate toward the right autoconf/make solution

9 years agoUpdated MediaGoblin config stuff to latest pyconfigure release
Christopher Allan Webber [Thu, 2 Oct 2014 20:47:54 +0000 (15:47 -0500)]
Updated MediaGoblin config stuff to latest pyconfigure release

Iterating towards what we want in the configure setup.

9 years agoMerge branch 'location'
Jessica Tallon [Thu, 9 Oct 2014 18:20:13 +0000 (19:20 +0100)]
Merge branch 'location'

Add Location model which holds textual, geolocation coordiantes
or postal addresses. This migrates data off Image model metadata
onto the general Location model. It also adds the ability for location
to be set on MediaEntry, User, MediaComment and Collection models.

The geolocation plugin has been updated so that the location can be displayed
in more general places rather than explicitely on the MediaEntry view.
If GPS coordiantes are set for the User the profile page will also have the
OSM provided by the geolocation plugin.

9 years agoAdd location model and migrations
Jessica Tallon [Mon, 15 Sep 2014 18:34:42 +0000 (19:34 +0100)]
Add location model and migrations

9 years agoMerge branch '905-activities'
Jessica Tallon [Tue, 7 Oct 2014 09:01:38 +0000 (10:01 +0100)]
Merge branch '905-activities'

    Add Activity and Generator models which allow for
    activities to be created. This now works with the
    feed API.

9 years agoAdd __repr__ to Activity and Generator class
Jessica Tallon [Tue, 7 Oct 2014 07:54:26 +0000 (08:54 +0100)]
Add __repr__ to Activity and Generator class

9 years agoFix bug where activity.content was not populated
Jessica Tallon [Sat, 4 Oct 2014 10:26:48 +0000 (11:26 +0100)]
Fix bug where activity.content was not populated

9 years agoFix all the unit tests and clean up code
Jessica Tallon [Thu, 4 Sep 2014 18:12:48 +0000 (19:12 +0100)]
Fix all the unit tests and clean up code

9 years agoFix typo in client registration API for logo_uri
Jessica Tallon [Thu, 2 Oct 2014 19:28:58 +0000 (20:28 +0100)]
Fix typo in client registration API for logo_uri

9 years agoInstall ExifRead from GitHub on Python 3.
Berker Peksag [Thu, 2 Oct 2014 18:27:27 +0000 (21:27 +0300)]
Install ExifRead from GitHub on Python 3.

9 years agoAdd initial migration guide.
Berker Peksag [Thu, 2 Oct 2014 17:17:34 +0000 (20:17 +0300)]
Add initial migration guide.

This can be moved to docs/source/devel/migrations.rst.

9 years agoDo not call AlembicMigrationManager.init_tables() for now.
Berker Peksag [Thu, 2 Oct 2014 17:16:46 +0000 (20:16 +0300)]
Do not call AlembicMigrationManager.init_tables() for now.

sqlalchemy-migrate will do this for us.

9 years agoPort "gmg batchaddmedia" command to Python 3.
Berker Peksag [Thu, 2 Oct 2014 17:13:46 +0000 (20:13 +0300)]
Port "gmg batchaddmedia" command to Python 3.

9 years agoRestore exif-py to tox config, for now...
Christopher Allan Webber [Thu, 2 Oct 2014 15:51:37 +0000 (10:51 -0500)]
Restore exif-py to tox config, for now...

9 years agoFix #549 - Deauthorize OAuth applications
Jessica Tallon [Wed, 1 Oct 2014 18:45:53 +0000 (19:45 +0100)]
Fix #549 - Deauthorize OAuth applications

9 years agoFix migrations on Python 2.
Christopher Allan Webber [Tue, 30 Sep 2014 21:34:15 +0000 (16:34 -0500)]
Fix migrations on Python 2.

This commit sponsored by Loïc Grobol.  Thank you!

9 years agoFix #919 - Use class names in super call not self.__class__
Jessica Tallon [Tue, 30 Sep 2014 11:50:51 +0000 (12:50 +0100)]
Fix #919 - Use class names in super call not self.__class__

9 years agoFix #952 - Force the footer to the bottom of the page
Jessica Tallon [Tue, 30 Sep 2014 10:23:24 +0000 (11:23 +0100)]
Fix #952 - Force the footer to the bottom of the page

9 years agoAdd logging to console to gunicorn
Jessica Tallon [Tue, 30 Sep 2014 08:27:53 +0000 (09:27 +0100)]
Add logging to console to gunicorn

9 years agoMerge branch '942-default-location'
Jessica Tallon [Mon, 29 Sep 2014 08:04:30 +0000 (09:04 +0100)]
Merge branch '942-default-location'

* 942-default-location:
  Add documentation on changing data dir and Fix stylistic changes
  Updated config_spec.ini to add %(data_basedir)s and make use of it!
  defaults now pulled from a mashup of mediagoblin.ini and config_spec.ini

9 years agoAdd documentation on changing data dir and Fix stylistic changes
Jessica Tallon [Fri, 19 Sep 2014 13:15:11 +0000 (14:15 +0100)]
Add documentation on changing data dir and Fix stylistic changes

9 years agopdf tests: use our own pdf doc as GOOD_PDF
Alon Levy [Thu, 25 Sep 2014 21:47:08 +0000 (00:47 +0300)]
pdf tests: use our own pdf doc as GOOD_PDF

remove non distributable good.pdf

10 years ago.gitignore celerybeat-schedule.
Christopher Allan Webber [Thu, 25 Sep 2014 20:09:09 +0000 (15:09 -0500)]
.gitignore celerybeat-schedule.

This commit sponsored by Thomas Løcke.  Thank you!

10 years agoUpdated config_spec.ini to add %(data_basedir)s and make use of it!
Christopher Allan Webber [Sun, 10 Aug 2014 21:27:29 +0000 (16:27 -0500)]
Updated config_spec.ini to add %(data_basedir)s and make use of it!

This commit sponsored by Loïc Grobol.  Thanks!

10 years agodefaults now pulled from a mashup of mediagoblin.ini and config_spec.ini
Christopher Allan Webber [Sun, 10 Aug 2014 21:19:50 +0000 (16:19 -0500)]
defaults now pulled from a mashup of mediagoblin.ini and config_spec.ini

This commit sponsored by Thomas Løcke.  Thank you!

10 years agoAvoid doing python setup.py sdist, use setup.py develop instead for tox
Christopher Allan Webber [Wed, 24 Sep 2014 15:37:47 +0000 (10:37 -0500)]
Avoid doing python setup.py sdist, use setup.py develop instead for tox

Berker had this previously, but for some reason it wasn't
working... here's why!  usedevelop needs to be in the testenv!  Aha!

This commit sponsored by Gian-Maria Daffré!  Thank you!

10 years agoSwitch print statement to print function
Christopher Allan Webber [Wed, 24 Sep 2014 14:32:05 +0000 (09:32 -0500)]
Switch print statement to print function

10 years agoremoving exif-py line
Christopher Allan Webber [Tue, 23 Sep 2014 15:46:47 +0000 (10:46 -0500)]
removing exif-py line

10 years agoFix Content-Disposition error for retrieving OAuth request tokens
Jessica Tallon [Wed, 24 Sep 2014 10:53:33 +0000 (11:53 +0100)]
Fix Content-Disposition error for retrieving OAuth request tokens

10 years agoMaking alembic happen with python 3 only... for now.
Christopher Allan Webber [Mon, 22 Sep 2014 19:05:36 +0000 (14:05 -0500)]
Making alembic happen with python 3 only... for now.

We want to make sure it works nicely first.

10 years agoMerge branch 'merge-python3-port'
Christopher Allan Webber [Mon, 22 Sep 2014 18:58:13 +0000 (13:58 -0500)]
Merge branch 'merge-python3-port'

Conflicts:
setup.py

10 years agoMediaGoblin 0.7.2 development cycle
Christopher Allan Webber [Mon, 22 Sep 2014 18:38:00 +0000 (13:38 -0500)]
MediaGoblin 0.7.2 development cycle

10 years agoFixing bullet points, sigh
Christopher Allan Webber [Sun, 21 Sep 2014 20:52:37 +0000 (15:52 -0500)]
Fixing bullet points, sigh

10 years agoMediaGoblin 0.7.1!
Christopher Allan Webber [Sun, 21 Sep 2014 19:25:06 +0000 (14:25 -0500)]
MediaGoblin 0.7.1!

10 years agoAdding Low Kian Seong to AUTHORS
Christopher Allan Webber [Sun, 21 Sep 2014 17:41:00 +0000 (12:41 -0500)]
Adding Low Kian Seong to AUTHORS

10 years agoUpdated the release notes
Christopher Allan Webber [Sun, 21 Sep 2014 17:39:04 +0000 (12:39 -0500)]
Updated the release notes

10 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sun, 21 Sep 2014 16:08:49 +0000 (11:08 -0500)]
Committing extracted and compiled translations

10 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sun, 21 Sep 2014 16:08:22 +0000 (11:08 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

10 years agodownload url removed
Christopher Allan Webber [Fri, 19 Sep 2014 21:54:10 +0000 (16:54 -0500)]
download url removed

10 years agoMerge remote-tracking branch 'refs/remotes/moggers87/garbage-branch'
Christopher Allan Webber [Fri, 19 Sep 2014 21:25:35 +0000 (16:25 -0500)]
Merge remote-tracking branch 'refs/remotes/moggers87/garbage-branch'

10 years agoTemporarily disable garbage collection
Christopher Allan Webber [Fri, 19 Sep 2014 20:56:26 +0000 (15:56 -0500)]
Temporarily disable garbage collection

We need to make sure we safely set up transactions here... it looks
pretty clearly like we aren't yet, so we need to review this.  This
should be re-enabled by 0.8.0.

10 years agoComment out the "check if the database is up to date" stuff
Christopher Allan Webber [Wed, 17 Sep 2014 23:07:50 +0000 (18:07 -0500)]
Comment out the "check if the database is up to date" stuff

... it's presently causing session issues :\

10 years agoLast two issues related to the python 3 merge tests: fixed!
Christopher Allan Webber [Tue, 16 Sep 2014 22:36:52 +0000 (17:36 -0500)]
Last two issues related to the python 3 merge tests: fixed!

 - Fix the "pulling the error out of excinfo" stuff for py3
 - The u"" only gets embedded in the string on py2.

This commit sponsored by Jeff Gibson.  Thanks, Jeff! :)

10 years agoModify deleteuser to fail gracefully
ayleph [Tue, 16 Sep 2014 22:29:09 +0000 (15:29 -0700)]
Modify deleteuser to fail gracefully

bin/gmg deleteuser will produce a traceback error if you attempt to delete a
user who does not exist. This commit provides a fix to allow deletuser to fail
gracefully.

This commit addresses https://issues.mediagoblin.org/ticket/969

10 years agoAnnnnd another json decode fix for py3! On a roll with these!
Christopher Allan Webber [Tue, 16 Sep 2014 20:35:23 +0000 (15:35 -0500)]
Annnnd another json decode fix for py3!  On a roll with these!

This commit sponsored by Ramana Kumar.  Thanks!

10 years agodecode to unicode before loading in json again, for py3
Christopher Allan Webber [Tue, 16 Sep 2014 20:33:46 +0000 (15:33 -0500)]
decode to unicode before loading in json again, for py3

This commit sponsored by Chris Cormack.  Thanks!

10 years agoMuch more nicely formed form error check
Christopher Allan Webber [Tue, 16 Sep 2014 20:25:30 +0000 (15:25 -0500)]
Much more nicely formed form error check

This doesn't rely on checking HTML output... thus, cleaner.

This commit sponsored by Alexandre Guédon.  Thank you!

10 years agoFix error check in test_edit.py for python 3
Christopher Allan Webber [Tue, 16 Sep 2014 20:15:13 +0000 (15:15 -0500)]
Fix error check in test_edit.py for python 3

This isn't the nicest of checks... we should probably be checking the
actual form passed into the context.  But for now, it's a fix.

10 years agoFix exception catching on python 3
Christopher Allan Webber [Tue, 16 Sep 2014 20:08:28 +0000 (15:08 -0500)]
Fix exception catching on python 3

This commit sponsored by Paul Smith.  Thank you!

10 years agoFix iteritems usage on python 3
Christopher Allan Webber [Tue, 16 Sep 2014 20:07:33 +0000 (15:07 -0500)]
Fix iteritems usage on python 3

This commit sponsored by Ben (Free Software Melbourne) Finney.  Thanks!

10 years agoThe scheduled garbage collection task was not being called due to it being misnamed
Matt Molyneaux [Tue, 16 Sep 2014 20:03:29 +0000 (21:03 +0100)]
The scheduled garbage collection task was not being called due to it being misnamed

Fix #968

10 years agojson.loads(request.body) => json.loads(response.body.decode()))
Christopher Allan Webber [Tue, 16 Sep 2014 19:56:13 +0000 (14:56 -0500)]
json.loads(request.body) => json.loads(response.body.decode()))

This fixes python 3 stuff.

This commit sponsored by James Reilly.  Thanks, James!

10 years agoImport mock correctly on py3
Christopher Allan Webber [Tue, 16 Sep 2014 19:46:02 +0000 (14:46 -0500)]
Import mock correctly on py3

This commit sponsored by Andrew McNicol.  Thank you!

10 years agoSimplify things here and use io.open
Christopher Allan Webber [Tue, 16 Sep 2014 19:37:52 +0000 (14:37 -0500)]
Simplify things here and use io.open

10 years agoFix test_legacy_api.py
Christopher Allan Webber [Tue, 16 Sep 2014 19:37:36 +0000 (14:37 -0500)]
Fix test_legacy_api.py

Or rather, reimplement one of Berker's fixes and add one of mine:
 - add back the http_auth_headers fix Berker wrote
 - decode to json when testing the response.body, since we have no
   idea what the order will be here

10 years agoImport mock from unittest if on py3
Christopher Allan Webber [Tue, 16 Sep 2014 19:26:40 +0000 (14:26 -0500)]
Import mock from unittest if on py3

10 years agoMerge branch 'master' into merge-python3-port
Christopher Allan Webber [Tue, 16 Sep 2014 19:01:43 +0000 (14:01 -0500)]
Merge branch 'master' into merge-python3-port

Has some issues, will iteratively fix!

Conflicts:
mediagoblin/gmg_commands/__init__.py
mediagoblin/gmg_commands/deletemedia.py
mediagoblin/gmg_commands/users.py
mediagoblin/oauth/views.py
mediagoblin/plugins/api/views.py
mediagoblin/tests/test_api.py
mediagoblin/tests/test_edit.py
mediagoblin/tests/test_oauth1.py
mediagoblin/tests/test_util.py
mediagoblin/tools/mail.py
mediagoblin/webfinger/views.py
setup.py

10 years agoTemporarily disabling the mediagoblin errors middleware
Christopher Allan Webber [Mon, 15 Sep 2014 19:26:57 +0000 (14:26 -0500)]
Temporarily disabling the mediagoblin errors middleware

We don't have paste (core) in py3, so....

10 years agoNo reason to wrap the rest of the options in a quote
Christopher Allan Webber [Mon, 15 Sep 2014 17:10:29 +0000 (12:10 -0500)]
No reason to wrap the rest of the options in a quote

This commit sponsored by Thane Williams.  Thank you!

10 years agoUpgrading gunicorn. Referenced issue is resolved.
Christopher Allan Webber [Mon, 15 Sep 2014 16:46:56 +0000 (11:46 -0500)]
Upgrading gunicorn.  Referenced issue is resolved.

Also, upgrading seems to fix weird
"RuntimeError: dictionary changed size during iteration" issues
I was seeing.  (Looked like a gunicorn issue, not ours.)