Skip to content

Commit 82fc62b

Browse files
Simplify generated code.
1 parent 4d487c5 commit 82fc62b

File tree

3 files changed

+114
-117
lines changed

3 files changed

+114
-117
lines changed

src/oracledb/connect_params.py

+48-49
Original file line numberDiff line numberDiff line change
@@ -319,55 +319,54 @@ def __init__(
319319

320320
def __repr__(self):
321321
return (
322-
self.__class__.__qualname__
323-
+ "("
324-
+ f"user={self.user!r}, "
325-
+ f"proxy_user={self.proxy_user!r}, "
326-
+ f"host={self.host!r}, "
327-
+ f"port={self.port!r}, "
328-
+ f"protocol={self.protocol!r}, "
329-
+ f"https_proxy={self.https_proxy!r}, "
330-
+ f"https_proxy_port={self.https_proxy_port!r}, "
331-
+ f"service_name={self.service_name!r}, "
332-
+ f"instance_name={self.instance_name!r}, "
333-
+ f"sid={self.sid!r}, "
334-
+ f"server_type={self.server_type!r}, "
335-
+ f"cclass={self.cclass!r}, "
336-
+ f"purity={self.purity!r}, "
337-
+ f"expire_time={self.expire_time!r}, "
338-
+ f"retry_count={self.retry_count!r}, "
339-
+ f"retry_delay={self.retry_delay!r}, "
340-
+ f"tcp_connect_timeout={self.tcp_connect_timeout!r}, "
341-
+ f"ssl_server_dn_match={self.ssl_server_dn_match!r}, "
342-
+ f"ssl_server_cert_dn={self.ssl_server_cert_dn!r}, "
343-
+ f"wallet_location={self.wallet_location!r}, "
344-
+ f"events={self.events!r}, "
345-
+ f"externalauth={self.externalauth!r}, "
346-
+ f"mode={self.mode!r}, "
347-
+ f"disable_oob={self.disable_oob!r}, "
348-
+ f"stmtcachesize={self.stmtcachesize!r}, "
349-
+ f"edition={self.edition!r}, "
350-
+ f"tag={self.tag!r}, "
351-
+ f"matchanytag={self.matchanytag!r}, "
352-
+ f"config_dir={self.config_dir!r}, "
353-
+ f"appcontext={self.appcontext!r}, "
354-
+ f"shardingkey={self.shardingkey!r}, "
355-
+ f"supershardingkey={self.supershardingkey!r}, "
356-
+ f"debug_jdwp={self.debug_jdwp!r}, "
357-
+ f"connection_id_prefix={self.connection_id_prefix!r}, "
358-
+ f"ssl_context={self.ssl_context!r}, "
359-
+ f"sdu={self.sdu!r}, "
360-
+ f"pool_boundary={self.pool_boundary!r}, "
361-
+ f"use_tcp_fast_open={self.use_tcp_fast_open!r}, "
362-
+ f"ssl_version={self.ssl_version!r}, "
363-
+ f"program={self.program!r}, "
364-
+ f"machine={self.machine!r}, "
365-
+ f"terminal={self.terminal!r}, "
366-
+ f"osuser={self.osuser!r}, "
367-
+ f"driver_name={self.driver_name!r}, "
368-
+ f"use_sni={self.use_sni!r}, "
369-
+ f"thick_mode_dsn_passthrough={self.thick_mode_dsn_passthrough!r}"
370-
+ ")"
322+
self.__class__.__qualname__ + "("
323+
f"user={self.user!r}, "
324+
f"proxy_user={self.proxy_user!r}, "
325+
f"host={self.host!r}, "
326+
f"port={self.port!r}, "
327+
f"protocol={self.protocol!r}, "
328+
f"https_proxy={self.https_proxy!r}, "
329+
f"https_proxy_port={self.https_proxy_port!r}, "
330+
f"service_name={self.service_name!r}, "
331+
f"instance_name={self.instance_name!r}, "
332+
f"sid={self.sid!r}, "
333+
f"server_type={self.server_type!r}, "
334+
f"cclass={self.cclass!r}, "
335+
f"purity={self.purity!r}, "
336+
f"expire_time={self.expire_time!r}, "
337+
f"retry_count={self.retry_count!r}, "
338+
f"retry_delay={self.retry_delay!r}, "
339+
f"tcp_connect_timeout={self.tcp_connect_timeout!r}, "
340+
f"ssl_server_dn_match={self.ssl_server_dn_match!r}, "
341+
f"ssl_server_cert_dn={self.ssl_server_cert_dn!r}, "
342+
f"wallet_location={self.wallet_location!r}, "
343+
f"events={self.events!r}, "
344+
f"externalauth={self.externalauth!r}, "
345+
f"mode={self.mode!r}, "
346+
f"disable_oob={self.disable_oob!r}, "
347+
f"stmtcachesize={self.stmtcachesize!r}, "
348+
f"edition={self.edition!r}, "
349+
f"tag={self.tag!r}, "
350+
f"matchanytag={self.matchanytag!r}, "
351+
f"config_dir={self.config_dir!r}, "
352+
f"appcontext={self.appcontext!r}, "
353+
f"shardingkey={self.shardingkey!r}, "
354+
f"supershardingkey={self.supershardingkey!r}, "
355+
f"debug_jdwp={self.debug_jdwp!r}, "
356+
f"connection_id_prefix={self.connection_id_prefix!r}, "
357+
f"ssl_context={self.ssl_context!r}, "
358+
f"sdu={self.sdu!r}, "
359+
f"pool_boundary={self.pool_boundary!r}, "
360+
f"use_tcp_fast_open={self.use_tcp_fast_open!r}, "
361+
f"ssl_version={self.ssl_version!r}, "
362+
f"program={self.program!r}, "
363+
f"machine={self.machine!r}, "
364+
f"terminal={self.terminal!r}, "
365+
f"osuser={self.osuser!r}, "
366+
f"driver_name={self.driver_name!r}, "
367+
f"use_sni={self.use_sni!r}, "
368+
f"thick_mode_dsn_passthrough={self.thick_mode_dsn_passthrough!r}"
369+
")"
371370
)
372371

373372
def _flatten_value(f):

src/oracledb/pool_params.py

+62-63
Original file line numberDiff line numberDiff line change
@@ -388,69 +388,68 @@ def __init__(
388388

389389
def __repr__(self):
390390
return (
391-
self.__class__.__qualname__
392-
+ "("
393-
+ f"min={self.min!r}, "
394-
+ f"max={self.max!r}, "
395-
+ f"increment={self.increment!r}, "
396-
+ f"connectiontype={self.connectiontype!r}, "
397-
+ f"getmode={self.getmode!r}, "
398-
+ f"homogeneous={self.homogeneous!r}, "
399-
+ f"timeout={self.timeout!r}, "
400-
+ f"wait_timeout={self.wait_timeout!r}, "
401-
+ f"max_lifetime_session={self.max_lifetime_session!r}, "
402-
+ f"session_callback={self.session_callback!r}, "
403-
+ f"max_sessions_per_shard={self.max_sessions_per_shard!r}, "
404-
+ f"soda_metadata_cache={self.soda_metadata_cache!r}, "
405-
+ f"ping_interval={self.ping_interval!r}, "
406-
+ f"ping_timeout={self.ping_timeout!r}, "
407-
+ f"user={self.user!r}, "
408-
+ f"proxy_user={self.proxy_user!r}, "
409-
+ f"host={self.host!r}, "
410-
+ f"port={self.port!r}, "
411-
+ f"protocol={self.protocol!r}, "
412-
+ f"https_proxy={self.https_proxy!r}, "
413-
+ f"https_proxy_port={self.https_proxy_port!r}, "
414-
+ f"service_name={self.service_name!r}, "
415-
+ f"instance_name={self.instance_name!r}, "
416-
+ f"sid={self.sid!r}, "
417-
+ f"server_type={self.server_type!r}, "
418-
+ f"cclass={self.cclass!r}, "
419-
+ f"purity={self.purity!r}, "
420-
+ f"expire_time={self.expire_time!r}, "
421-
+ f"retry_count={self.retry_count!r}, "
422-
+ f"retry_delay={self.retry_delay!r}, "
423-
+ f"tcp_connect_timeout={self.tcp_connect_timeout!r}, "
424-
+ f"ssl_server_dn_match={self.ssl_server_dn_match!r}, "
425-
+ f"ssl_server_cert_dn={self.ssl_server_cert_dn!r}, "
426-
+ f"wallet_location={self.wallet_location!r}, "
427-
+ f"events={self.events!r}, "
428-
+ f"externalauth={self.externalauth!r}, "
429-
+ f"mode={self.mode!r}, "
430-
+ f"disable_oob={self.disable_oob!r}, "
431-
+ f"stmtcachesize={self.stmtcachesize!r}, "
432-
+ f"edition={self.edition!r}, "
433-
+ f"tag={self.tag!r}, "
434-
+ f"matchanytag={self.matchanytag!r}, "
435-
+ f"config_dir={self.config_dir!r}, "
436-
+ f"appcontext={self.appcontext!r}, "
437-
+ f"shardingkey={self.shardingkey!r}, "
438-
+ f"supershardingkey={self.supershardingkey!r}, "
439-
+ f"debug_jdwp={self.debug_jdwp!r}, "
440-
+ f"connection_id_prefix={self.connection_id_prefix!r}, "
441-
+ f"ssl_context={self.ssl_context!r}, "
442-
+ f"sdu={self.sdu!r}, "
443-
+ f"pool_boundary={self.pool_boundary!r}, "
444-
+ f"use_tcp_fast_open={self.use_tcp_fast_open!r}, "
445-
+ f"ssl_version={self.ssl_version!r}, "
446-
+ f"program={self.program!r}, "
447-
+ f"machine={self.machine!r}, "
448-
+ f"terminal={self.terminal!r}, "
449-
+ f"osuser={self.osuser!r}, "
450-
+ f"driver_name={self.driver_name!r}, "
451-
+ f"use_sni={self.use_sni!r}, "
452-
+ f"thick_mode_dsn_passthrough={self.thick_mode_dsn_passthrough!r}"
453-
+ ")"
391+
self.__class__.__qualname__ + "("
392+
f"min={self.min!r}, "
393+
f"max={self.max!r}, "
394+
f"increment={self.increment!r}, "
395+
f"connectiontype={self.connectiontype!r}, "
396+
f"getmode={self.getmode!r}, "
397+
f"homogeneous={self.homogeneous!r}, "
398+
f"timeout={self.timeout!r}, "
399+
f"wait_timeout={self.wait_timeout!r}, "
400+
f"max_lifetime_session={self.max_lifetime_session!r}, "
401+
f"session_callback={self.session_callback!r}, "
402+
f"max_sessions_per_shard={self.max_sessions_per_shard!r}, "
403+
f"soda_metadata_cache={self.soda_metadata_cache!r}, "
404+
f"ping_interval={self.ping_interval!r}, "
405+
f"ping_timeout={self.ping_timeout!r}, "
406+
f"user={self.user!r}, "
407+
f"proxy_user={self.proxy_user!r}, "
408+
f"host={self.host!r}, "
409+
f"port={self.port!r}, "
410+
f"protocol={self.protocol!r}, "
411+
f"https_proxy={self.https_proxy!r}, "
412+
f"https_proxy_port={self.https_proxy_port!r}, "
413+
f"service_name={self.service_name!r}, "
414+
f"instance_name={self.instance_name!r}, "
415+
f"sid={self.sid!r}, "
416+
f"server_type={self.server_type!r}, "
417+
f"cclass={self.cclass!r}, "
418+
f"purity={self.purity!r}, "
419+
f"expire_time={self.expire_time!r}, "
420+
f"retry_count={self.retry_count!r}, "
421+
f"retry_delay={self.retry_delay!r}, "
422+
f"tcp_connect_timeout={self.tcp_connect_timeout!r}, "
423+
f"ssl_server_dn_match={self.ssl_server_dn_match!r}, "
424+
f"ssl_server_cert_dn={self.ssl_server_cert_dn!r}, "
425+
f"wallet_location={self.wallet_location!r}, "
426+
f"events={self.events!r}, "
427+
f"externalauth={self.externalauth!r}, "
428+
f"mode={self.mode!r}, "
429+
f"disable_oob={self.disable_oob!r}, "
430+
f"stmtcachesize={self.stmtcachesize!r}, "
431+
f"edition={self.edition!r}, "
432+
f"tag={self.tag!r}, "
433+
f"matchanytag={self.matchanytag!r}, "
434+
f"config_dir={self.config_dir!r}, "
435+
f"appcontext={self.appcontext!r}, "
436+
f"shardingkey={self.shardingkey!r}, "
437+
f"supershardingkey={self.supershardingkey!r}, "
438+
f"debug_jdwp={self.debug_jdwp!r}, "
439+
f"connection_id_prefix={self.connection_id_prefix!r}, "
440+
f"ssl_context={self.ssl_context!r}, "
441+
f"sdu={self.sdu!r}, "
442+
f"pool_boundary={self.pool_boundary!r}, "
443+
f"use_tcp_fast_open={self.use_tcp_fast_open!r}, "
444+
f"ssl_version={self.ssl_version!r}, "
445+
f"program={self.program!r}, "
446+
f"machine={self.machine!r}, "
447+
f"terminal={self.terminal!r}, "
448+
f"osuser={self.osuser!r}, "
449+
f"driver_name={self.driver_name!r}, "
450+
f"use_sni={self.use_sni!r}, "
451+
f"thick_mode_dsn_passthrough={self.thick_mode_dsn_passthrough!r}"
452+
")"
454453
)
455454

456455
@property

utils/build_from_template.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -----------------------------------------------------------------------------
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
2+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
33
#
44
# This software is dual-licensed to you under the Universal Permissive License
55
# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -312,7 +312,7 @@ def params_repr_content(indent):
312312
Generates the content for the params_repr template tag.
313313
"""
314314
parts = [
315-
f'\n{indent} + f"{field.name}={{self.{field.name}!r}}, "'
315+
f'\n{indent} f"{field.name}={{self.{field.name}!r}}, "'
316316
for field in fields
317317
if not field.hidden
318318
]
@@ -321,10 +321,9 @@ def params_repr_content(indent):
321321
return (
322322
func_def
323323
+ f"\n{indent} return ("
324-
+ f"\n{indent} self.__class__.__qualname__"
325-
+ f'\n{indent} + "("'
324+
+ f'\n{indent} self.__class__.__qualname__ + "("'
326325
+ "".join(parts)
327-
+ f'\n{indent} + ")"'
326+
+ f'\n{indent} ")"'
328327
+ f"\n{indent} )"
329328
)
330329

0 commit comments

Comments
 (0)