File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -413,10 +413,6 @@ def include(
413
413
or isinstance (v , type )
414
414
and issubclass (v , Env )
415
415
}
416
- if not overwrite :
417
- overlap = set (cls .__dict__ .keys ()) & set (to_include .keys ())
418
- if overlap :
419
- raise ValueError ("Configuration clashes detected: {}" .format (overlap ))
420
416
421
417
own_prefix = _normalized (getattr (cls , "__prefix__" , "" ))
422
418
@@ -434,6 +430,11 @@ def include(
434
430
435
431
return None
436
432
433
+ if not overwrite :
434
+ overlap = set (cls .__dict__ .keys ()) & set (to_include .keys ())
435
+ if overlap :
436
+ raise ValueError ("Configuration clashes detected: {}" .format (overlap ))
437
+
437
438
other_prefix = getattr (env_spec , "__prefix__" , "" )
438
439
for k , v in to_include .items ():
439
440
if getattr (cls , k , None ) is not v :
Original file line number Diff line number Diff line change @@ -250,12 +250,14 @@ class GlobalConfig(Env):
250
250
__prefix__ = "myapp"
251
251
252
252
debug_mode = Env .var (bool , "debug" , default = False )
253
+ enable = Env .var (bool , "enable" , default = True )
253
254
254
255
class ServiceConfig (Env ):
255
256
__prefix__ = "service"
256
257
257
258
host = Env .var (str , "host" , default = "localhost" )
258
259
port = Env .var (int , "port" , default = 3000 )
260
+ enable = Env .var (bool , "enable" , default = False )
259
261
260
262
GlobalConfig .include (ServiceConfig , namespace = "service" )
261
263
with pytest .raises (ValueError ):
You can’t perform that action at this time.
0 commit comments