Skip to content

Commit 89c468b

Browse files
author
Greg Turnquist
committed
CRLF conversion.
1 parent 02502cf commit 89c468b

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

samples/springwiki/noxml.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,33 @@ def userDetailsService2(self):
4747

4848
@Object
4949
def plainEncoder(self):
50-
return PlaintextPasswordEncoder()
50+
return PlaintextPasswordEncoder()
5151

5252
@Object
5353
def plainAuthenticationProvider(self):
5454
provider = DaoAuthenticationProvider()
5555
provider.user_details_service = self.userDetailsService2()
5656
provider.password_encoder = self.plainEncoder()
5757
return provider
58-
58+
5959

6060
@Object
6161
def authenticationManager(self):
6262
manager = AuthenticationManager()
6363
manager.auth_providers = [self.plainAuthenticationProvider()]
6464
return manager
65-
65+
6666
@Object
6767
def authenticationProcessingFilter(self):
6868
filter = AuthenticationProcessingFilter()
6969
filter.auth_manager = self.authenticationManager()
7070
filter.alwaysReauthenticate = False
7171
return filter
72-
72+
7373
@Object
7474
def cherrypySessionStrategy(self):
7575
return CP3SessionStrategy()
76-
76+
7777
@Object
7878
def redirectStrategy(self):
7979
return CP3RedirectStrategy()
@@ -89,20 +89,20 @@ def authenticationProcessingFilterEntryPoint(self):
8989
filter_point = AuthenticationProcessingFilterEntryPoint()
9090
filter_point.loginFormUrl = "/login"
9191
filter_point.redirectStrategy = self.redirectStrategy()
92-
return filter_point
92+
return filter_point
9393
@Object
9494
def accessDeniedHandler(self):
9595
handler = SimpleAccessDeniedHandler()
9696
handler.errorPage = "/accessDenied"
9797
handler.redirectStrategy = self.redirectStrategy()
98-
return handler
98+
return handler
9999

100100
@Object
101101
def exceptionTranslationFilter(self):
102102
filter = ExceptionTranslationFilter()
103103
filter.authenticationEntryPoint = self.authenticationProcessingFilterEntryPoint()
104104
filter.accessDeniedHandler = self.accessDeniedHandler()
105-
return filter
105+
return filter
106106

107107
@Object
108108
def filterSecurityInterceptor(self):
@@ -112,13 +112,13 @@ def filterSecurityInterceptor(self):
112112
interceptor.access_decision_mgr = self.accessDecisionManager()
113113
interceptor.sessionStrategy = self.cherrypySessionStrategy()
114114
interceptor.obj_def_source = [("/.*", ["VET_ANY", "CUSTOMER_ANY"])]
115-
return interceptor
115+
return interceptor
116116

117117
@Object
118118
def vetRoleVoter(self):
119119
voter = RoleVoter()
120120
voter.role_prefix = "VET"
121-
return voter
121+
return voter
122122

123123
@Object
124124
def customerRoleVoter(self):
@@ -131,7 +131,7 @@ def accessDecisionManager(self):
131131
policy = AffirmativeBased()
132132
policy.allow_if_all_abstain = False
133133
policy.access_decision_voters = [self.vetRoleVoter(), self.customerRoleVoter()]
134-
return policy
134+
return policy
135135

136136
@Object
137137
def filterChainProxy(self):
@@ -145,7 +145,7 @@ def filterChainProxy(self):
145145
"authenticationProcessingFilter",
146146
"filterSecurityInterceptor"]
147147
)]
148-
return proxy
148+
return proxy
149149

150150
@Object
151151
def loginForm(self):
@@ -155,5 +155,5 @@ def loginForm(self):
155155
form.authenticationManager = self.authenticationManager()
156156
form.redirectStrategy = self.redirectStrategy()
157157
form.httpContextFilter = self.httpContextFilter()
158-
return form
158+
return form
159159

test/springpythontest/databaseCoreTestCases.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ def createTables(self):
541541
dt.execute("DROP TABLE IF EXISTS animal")
542542
dt.execute("""
543543
CREATE TABLE animal (
544-
id serial PRIMARY KEY,
544+
id serial PRIMARY KEY,
545545
name VARCHAR(11),
546546
category VARCHAR(20),
547547
population SMALLINT
@@ -599,8 +599,8 @@ def createTables(self):
599599
dt = DatabaseTemplate(self.factory)
600600
dt.execute("DROP TABLE IF EXISTS animal")
601601
dt.execute("""
602-
CREATE TABLE animal (
603-
id serial PRIMARY KEY,
602+
CREATE TABLE animal (
603+
id serial PRIMARY KEY,
604604
name VARCHAR(11),
605605
category VARCHAR(20),
606606
population integer

test/springpythontest/databaseTransactionTestCases.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -394,16 +394,16 @@ def createTables(self):
394394
dt.execute("DROP TABLE IF EXISTS animal")
395395
dt.execute("""
396396
CREATE TABLE animal (
397-
id serial PRIMARY KEY,
397+
id serial PRIMARY KEY,
398398
name VARCHAR(11),
399399
category VARCHAR(20),
400400
population SMALLINT
401401
) ENGINE=innodb
402402
""")
403403
dt.execute("DROP TABLE IF EXISTS account")
404404
dt.execute("""
405-
CREATE TABLE account (
406-
id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
405+
CREATE TABLE account (
406+
id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
407407
account_num VARCHAR(11),
408408
balance FLOAT(10)
409409
) ENGINE=innodb
@@ -442,15 +442,15 @@ def createTables(self):
442442

443443
dt.execute("DROP TABLE IF EXISTS animal")
444444
dt.execute("""
445-
CREATE TABLE animal (
446-
id serial PRIMARY KEY,
445+
CREATE TABLE animal (
446+
id serial PRIMARY KEY,
447447
name VARCHAR(11)
448448
)
449449
""")
450450
dt.execute("DROP TABLE IF EXISTS account")
451451
dt.execute("""
452-
CREATE TABLE account (
453-
id serial PRIMARY KEY,
452+
CREATE TABLE account (
453+
id serial PRIMARY KEY,
454454
account_num VARCHAR(11),
455455
balance FLOAT(10)
456456
)
@@ -502,14 +502,14 @@ def createTables(self):
502502
dt.execute("DROP TABLE IF EXISTS account")
503503

504504
dt.execute("""
505-
CREATE TABLE animal (
506-
id serial PRIMARY KEY,
505+
CREATE TABLE animal (
506+
id serial PRIMARY KEY,
507507
name VARCHAR(11)
508508
)
509509
""")
510510
dt.execute("""
511-
CREATE TABLE account (
512-
id serial PRIMARY KEY,
511+
CREATE TABLE account (
512+
id serial PRIMARY KEY,
513513
account_num VARCHAR(11),
514514
balance FLOAT(10)
515515
)

0 commit comments

Comments
 (0)