Skip to content

Commit

Permalink
2to3.
Browse files Browse the repository at this point in the history
  • Loading branch information
teleyinex committed Sep 12, 2017
1 parent f8f99a2 commit 26b2b12
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions pybossa/core.py
Expand Up @@ -95,7 +95,7 @@ def configure_app(app):
app.config['SQLALCHEMY_DATABASE_TEST_URI']
# Enable Slave bind in case is missing using Master node
if app.config.get('SQLALCHEMY_BINDS') is None:
print "Slave binds are misssing, adding Master as slave too."
print("Slave binds are misssing, adding Master as slave too.")
app.config['SQLALCHEMY_BINDS'] = \
dict(slave=app.config.get('SQLALCHEMY_DATABASE_URI'))
app.url_map.strict_slashes = app.config.get('STRICT_SLASHES')
Expand Down Expand Up @@ -243,7 +243,7 @@ def setup_logging(app):
def setup_login_manager(app):
"""Setup login manager."""
login_manager.login_view = 'account.signin'
login_manager.login_message = u"Please sign in to access this page."
login_manager.login_message = "Please sign in to access this page."

@login_manager.user_loader
def _load_user(username):
Expand Down Expand Up @@ -328,10 +328,10 @@ def setup_twitter_login(app):
from pybossa.view.twitter import blueprint as twitter_bp
app.register_blueprint(twitter_bp, url_prefix='/twitter')
except Exception as inst: # pragma: no cover
print type(inst)
print inst.args
print inst
print "Twitter signin disabled"
print(type(inst))
print(inst.args)
print(inst)
print("Twitter signin disabled")
log_message = 'Twitter signin disabled: %s' % str(inst)
app.logger.info(log_message)

Expand All @@ -344,10 +344,10 @@ def setup_facebook_login(app):
from pybossa.view.facebook import blueprint as facebook_bp
app.register_blueprint(facebook_bp, url_prefix='/facebook')
except Exception as inst: # pragma: no cover
print type(inst)
print inst.args
print inst
print "Facebook signin disabled"
print(type(inst))
print(inst.args)
print(inst)
print("Facebook signin disabled")
log_message = 'Facebook signin disabled: %s' % str(inst)
app.logger.info(log_message)

Expand All @@ -360,10 +360,10 @@ def setup_google_login(app):
from pybossa.view.google import blueprint as google_bp
app.register_blueprint(google_bp, url_prefix='/google')
except Exception as inst: # pragma: no cover
print type(inst)
print inst.args
print inst
print "Google signin disabled"
print(type(inst))
print(inst.args)
print(inst)
print("Google signin disabled")
log_message = 'Google signin disabled: %s' % str(inst)
app.logger.info(log_message)

Expand All @@ -378,10 +378,10 @@ def setup_flickr_importer(app):
importer_params = {'api_key': app.config['FLICKR_API_KEY']}
importer.register_flickr_importer(importer_params)
except Exception as inst: # pragma: no cover
print type(inst)
print inst.args
print inst
print "Flickr importer not available"
print(type(inst))
print(inst.args)
print(inst)
print("Flickr importer not available")
log_message = 'Flickr importer not available: %s' % str(inst)
app.logger.info(log_message)

Expand All @@ -391,10 +391,10 @@ def setup_dropbox_importer(app):
if app.config['DROPBOX_APP_KEY']:
importer.register_dropbox_importer()
except Exception as inst: # pragma: no cover
print type(inst)
print inst.args
print inst
print "Dropbox importer not available"
print(type(inst))
print(inst.args)
print(inst)
print("Dropbox importer not available")
log_message = 'Dropbox importer not available: %s' % str(inst)
app.logger.info(log_message)

Expand All @@ -409,10 +409,10 @@ def setup_twitter_importer(app):
}
importer.register_twitter_importer(importer_params)
except Exception as inst: # pragma: no cover
print type(inst)
print inst.args
print inst
print "Twitter importer not available"
print(type(inst))
print(inst.args)
print(inst)
print("Twitter importer not available")
log_message = 'Twitter importer not available: %s' % str(inst)
app.logger.info(log_message)

Expand All @@ -424,10 +424,10 @@ def setup_youtube_importer(app):
}
importer.register_youtube_importer(importer_params)
except Exception as inst: # pragma: no cover
print type(inst)
print inst.args
print inst
print "Youtube importer not available"
print(type(inst))
print(inst.args)
print(inst)
print("Youtube importer not available")
log_message = 'Youtube importer not available: %s' % str(inst)
app.logger.info(log_message)

Expand Down Expand Up @@ -543,7 +543,7 @@ def _global_template_context():
if app.config.get('ANNOUNCEMENT'):
announcement = app.config['ANNOUNCEMENT']
if current_user and current_user.is_authenticated():
for key in announcement.keys():
for key in list(announcement.keys()):
if key == 'admin' and current_user.admin:
flash(announcement[key], 'info')
if key == 'owner' and len(current_user.projects) != 0:
Expand Down

0 comments on commit 26b2b12

Please sign in to comment.