From 6b4f6fa13cb5533f25b8601332794b9592e241b0 Mon Sep 17 00:00:00 2001
From: Anton Sarukhanov <code@ant.sr>
Date: Thu, 4 Feb 2016 18:05:25 -0500
Subject: [PATCH] Remove trash in models and requirements.
---
models.py | 7 -------
requirements.txt | 6 ------
2 files changed, 13 deletions(-)
diff --git a/models.py b/models.py
index 45f256a..3e21011 100644
--- a/models.py
+++ b/models.py
@@ -30,7 +30,6 @@ class Model(db.Model):
@classmethod
def get_or_create(self, session, create_method='', create_method_kwargs=None, **kwargs):
""" Try to find an existing object filtering by kwargs. If not found, create. """
- keys = [k.name for k in inspect(self).primary_key]
inspector = reflection.Inspector.from_engine(db.engine)
keys = list(chain.from_iterable([i['column_names'] for i in
inspector.get_indexes(inspect(self).mapped_table)]))
@@ -38,12 +37,6 @@ class Model(db.Model):
filter_args = {arg: kwargs[arg] for arg in kwargs if arg in keys}
try:
return session.query(self).filter_by(**filter_args).one()
- except MultipleResultsFound:
- raise Exception("{0} matches in get_or_create. This should never happen."
- " More primary keys are probably needed for some models."
- "\nkwargs = {1}\nkeys = {2}\nfilter_args = {3}"
- .format(session.query(self).filter_by(**filter_args).count(),
- kwargs, keys, filter_args))
except NoResultFound:
kwargs.update(create_method_kwargs or {})
new = getattr(self, create_method, self)(**kwargs)
diff --git a/requirements.txt b/requirements.txt
index 3bc0f01..a7a4fa6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,19 +13,13 @@ aiohttp==0.18.4
alembic==0.8.3
amqp==1.4.7
anyjson==0.3.3
-backports-abc==0.4
billiard==3.3.0.21
celery==3.1.19
-chardet==2.3.0
itsdangerous==0.24
kombu==3.0.29
-line-profiler==1.0
lxml==3.4.4
-psutil==3.3.0
psycopg2==2.6.1
-python-editor==0.4
pytz==2015.7
redis==2.10.5
requests==2.8.1
requests-futures==0.9.5
-tornado==4.3
--
GitLab