From fa5c9a00f43e877b44ec083f1fc243a1c697e49d Mon Sep 17 00:00:00 2001
From: farhaanbukhsh <farhaan.bukhsh@gmail.com>
Date: Jan 19 2016 15:21:02 +0000
Subject: Cleaning up and implementing pep8 standards


---

diff --git a/alembic/versions/1b6d7dc5600a_versioning_passwords.py b/alembic/versions/1b6d7dc5600a_versioning_passwords.py
index d134690..ff1aced 100644
--- a/alembic/versions/1b6d7dc5600a_versioning_passwords.py
+++ b/alembic/versions/1b6d7dc5600a_versioning_passwords.py
@@ -17,10 +17,11 @@ from pagure.lib import model
 
 
 def upgrade():
-        engine = op.get_bind().engine
-        session = sa.orm.scoped_session(sa.orm.sessionmaker(bind=engine))
-        session.query(model.User).update({model.User.password: '$1$' + model.User.password}, synchronize_session=False);
-        session.commit()
+    engine = op.get_bind().engine
+    session = sa.orm.scoped_session(sa.orm.sessionmaker(bind=engine))
+    session.query(model.User).update(
+        {model.User.password: '$1$' + model.User.password}, synchronize_session=False)
+    session.commit()
 
 
 def downgrade():
diff --git a/pagure/ui/login.py b/pagure/ui/login.py
index 8f1978f..27b3018 100644
--- a/pagure/ui/login.py
+++ b/pagure/ui/login.py
@@ -25,16 +25,10 @@ import pagure.lib.login
 import pagure.lib.model as model
 import pagure.lib.notify
 from pagure import APP, SESSION
-<<<<<<< HEAD
 from pagure.lib.login import generate_hashed_value, check_password
-=======
-from pagure.lib.login import generate_hashed_value, retrieve_hashed_value, get_password
->>>>>>> Add fucntions in lib
 
 # pylint: disable=E1101
 
-
-
 @APP.route('/user/new/', methods=['GET', 'POST'])
 @APP.route('/user/new', methods=['GET', 'POST'])
 def new_user():
@@ -125,8 +119,8 @@ def do_login():
 
         elif user_obj.token:
             flask.flash(
-               'Invalid user, did you confirm the creation with the url '
-               'provided by email?', 'error')
+                'Invalid user, did you confirm the creation with the url '
+                'provided by email?', 'error')
             return flask.redirect(flask.url_for('auth_login'))
 
         else:
@@ -298,7 +292,8 @@ def change_password(username):
 
     if form.validate_on_submit():
 
-        old_password = get_password(form.old_password.data, user_password, version)
+        old_password = get_password(
+            form.old_password.data, user_password, version)
 
         try:
             password_checks = check_password(