Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions app/database.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

from sqlalchemy import create_engine, Column, String, Integer
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy import create_engine, String, Integer, text
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
from sqlalchemy.orm import sessionmaker

Base = declarative_base()
class Base(DeclarativeBase):
pass


class User(Base):
__tablename__ = 'users'

id = Column(Integer, primary_key=True)
username = Column(String(50))
password = Column(String(50))
id: Mapped[int] = mapped_column(Integer, primary_key=True)
username: Mapped[str] = mapped_column(String(50))
password: Mapped[str] = mapped_column(String(50))

def __unicode__(self):
def __str__(self):
return u"User: %s" % self.username


Expand All @@ -35,14 +36,14 @@ def add_user(self, username, password):

def get_user(self, username):
query = "SELECT * FROM users WHERE username = '%s'" % username
result = self.session.execute(query)
result = self.session.execute(text(query))
return result.first()

def legacy_string_types(self):
text = u"Unicode text"
byte_string = b"Byte string"

if isinstance(text, unicode):
if isinstance(text, str):
result_unicode = True
else:
result_unicode = False
Expand All @@ -55,4 +56,4 @@ def legacy_string_types(self):
return {
'unicode_check': result_unicode,
'str_check': result_str
}
}
18 changes: 9 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
author='Test Author',
author_email='test@example.com',
packages=find_packages(),
python_requires='>=2.7, <3',
python_requires='>=3.8',
install_requires=[
'requests==2.5.3',
'PyYAML==3.12',
'Flask==0.12.2',
'Jinja2==2.8',
'SQLAlchemy==1.0.0',
'urllib3==1.20',
'Werkzeug==0.11',
'requests==2.32.5',
'PyYAML==6.0.3',
'Flask==3.1.2',
'Jinja2==3.1.6',
'SQLAlchemy==2.0.43',
'urllib3==2.5.0',
'Werkzeug==3.1.3',
],
tests_require=[
'mock==2.0.0',
'unittest2==1.1.0',
],
test_suite='tests',
)
)
Loading