1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
Description: use new name
Author: Dominik Wombacher, Rebecca N. Palmer <rebecca_palmer@zoho.com>
Origin: upstream
Forwarded: not-needed
--- a/pagure/hooks/fedmsg_hook.py
+++ b/pagure/hooks/fedmsg_hook.py
@@ -17,7 +17,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
from pagure.hooks import BaseHook, BaseRunner
--- a/pagure/hooks/irc.py
+++ b/pagure/hooks/irc.py
@@ -18,7 +18,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
from pagure.hooks import BaseHook, RequiredIf
--- a/pagure/hooks/mail.py
+++ b/pagure/hooks/mail.py
@@ -20,7 +20,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
from pagure.config import config as pagure_config
--- a/pagure/hooks/mirror_hook.py
+++ b/pagure/hooks/mirror_hook.py
@@ -16,7 +16,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
import pagure.config
--- a/pagure/hooks/pagure_ci.py
+++ b/pagure/hooks/pagure_ci.py
@@ -18,7 +18,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
import pagure.lib.login
--- a/pagure/hooks/pagure_force_commit.py
+++ b/pagure/hooks/pagure_force_commit.py
@@ -17,7 +17,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
import pagure.lib.git
--- a/pagure/hooks/pagure_hook.py
+++ b/pagure/hooks/pagure_hook.py
@@ -21,7 +21,7 @@ try:
except ImportError:
from flask_wtf import Form as FlaskForm
from sqlalchemy.exc import SQLAlchemyError
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
import pagure.config
--- a/pagure/hooks/pagure_no_new_branches.py
+++ b/pagure/hooks/pagure_no_new_branches.py
@@ -17,7 +17,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
from pagure.hooks import BaseHook, BaseRunner
--- a/pagure/hooks/pagure_request_hook.py
+++ b/pagure/hooks/pagure_request_hook.py
@@ -17,7 +17,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
import pagure.lib.git
--- a/pagure/hooks/pagure_ticket_hook.py
+++ b/pagure/hooks/pagure_ticket_hook.py
@@ -19,7 +19,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
import pagure.lib.git
--- a/pagure/hooks/pagure_unsigned_commits.py
+++ b/pagure/hooks/pagure_unsigned_commits.py
@@ -17,7 +17,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
import pagure.config
--- a/pagure/hooks/rtd.py
+++ b/pagure/hooks/rtd.py
@@ -19,7 +19,7 @@ try:
from flask_wtf import FlaskForm
except ImportError:
from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import backref
import pagure
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -29,7 +29,7 @@ from sqlalchemy.exc import SQLAlchemyErr
from sqlalchemy.orm import backref
from sqlalchemy.orm import sessionmaker
from sqlalchemy.orm import scoped_session
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship as relation
from sqlalchemy.orm import validates
import pagure.exceptions
|
