Skip to content

Commit f1b77ba

Browse files
rhempelrhempel
committed
Clean up parenthesis and driver name lists
1 parent 5c44cbc commit f1b77ba

File tree

2 files changed

+44
-59
lines changed

2 files changed

+44
-59
lines changed

‎ev3dev.py‎

Lines changed: 34 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ def get_attr_from_set( self, attribute ):
165165

166166
#~autogen python_generic-class classes.motor>currentClass
167167

168-
169168
class Motor(Device):
170169

171170
"""
@@ -178,10 +177,10 @@ class Motor(Device):
178177
SYSTEM_CLASS_NAME = 'tacho-motor'
179178
SYSTEM_DEVICE_NAME_CONVENTION = 'motor*'
180179

181-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
180+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
182181
if port is not None:
183182
kwargs['port_name'] = port
184-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, **kwargs )
183+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, **kwargs)
185184

186185
#~autogen
187186
#~autogen python_generic-get-set classes.motor>currentClass
@@ -645,7 +644,6 @@ def reset( self, **kwargs ):
645644
#~autogen
646645
#~autogen python_generic-class classes.largeMotor>currentClass
647646

648-
649647
class LargeMotor(Motor):
650648

651649
"""
@@ -655,15 +653,14 @@ class LargeMotor(Motor):
655653
SYSTEM_CLASS_NAME = Motor.SYSTEM_CLASS_NAME
656654
SYSTEM_DEVICE_NAME_CONVENTION = Motor.SYSTEM_DEVICE_NAME_CONVENTION
657655

658-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
656+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
659657
if port is not None:
660658
kwargs['port_name'] = port
661-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-l-motor', ], **kwargs )
659+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-l-motor'], **kwargs)
662660

663661
#~autogen
664662
#~autogen python_generic-class classes.mediumMotor>currentClass
665663

666-
667664
class MediumMotor(Motor):
668665

669666
"""
@@ -673,15 +670,14 @@ class MediumMotor(Motor):
673670
SYSTEM_CLASS_NAME = Motor.SYSTEM_CLASS_NAME
674671
SYSTEM_DEVICE_NAME_CONVENTION = Motor.SYSTEM_DEVICE_NAME_CONVENTION
675672

676-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
673+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
677674
if port is not None:
678675
kwargs['port_name'] = port
679-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-m-motor', ], **kwargs )
676+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-m-motor'], **kwargs)
680677

681678
#~autogen
682679
#~autogen python_generic-class classes.dcMotor>currentClass
683680

684-
685681
class DcMotor(Device):
686682

687683
"""
@@ -693,10 +689,10 @@ class DcMotor(Device):
693689
SYSTEM_CLASS_NAME = 'dc-motor'
694690
SYSTEM_DEVICE_NAME_CONVENTION = 'motor*'
695691

696-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
692+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
697693
if port is not None:
698694
kwargs['port_name'] = port
699-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, **kwargs )
695+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, **kwargs)
700696

701697
#~autogen
702698
#~autogen python_generic-get-set classes.dcMotor>currentClass
@@ -915,7 +911,6 @@ def stop( self, **kwargs ):
915911
#~autogen
916912
#~autogen python_generic-class classes.servoMotor>currentClass
917913

918-
919914
class ServoMotor(Device):
920915

921916
"""
@@ -926,10 +921,10 @@ class ServoMotor(Device):
926921
SYSTEM_CLASS_NAME = 'servo-motor'
927922
SYSTEM_DEVICE_NAME_CONVENTION = 'motor*'
928923

929-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
924+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
930925
if port is not None:
931926
kwargs['port_name'] = port
932-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, **kwargs )
927+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, **kwargs)
933928

934929
#~autogen
935930
#~autogen python_generic-get-set classes.servoMotor>currentClass
@@ -1102,7 +1097,6 @@ def float( self, **kwargs ):
11021097

11031098
#~autogen python_generic-class classes.sensor>currentClass
11041099

1105-
11061100
class Sensor(Device):
11071101

11081102
"""
@@ -1125,10 +1119,10 @@ class Sensor(Device):
11251119
SYSTEM_CLASS_NAME = 'lego-sensor'
11261120
SYSTEM_DEVICE_NAME_CONVENTION = 'sensor*'
11271121

1128-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1122+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
11291123
if port is not None:
11301124
kwargs['port_name'] = port
1131-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, **kwargs )
1125+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, **kwargs)
11321126

11331127
#~autogen
11341128
#~autogen python_generic-get-set classes.sensor>currentClass
@@ -1228,7 +1222,6 @@ def value(self, n=0):
12281222

12291223
#~autogen python_generic-class classes.i2cSensor>currentClass
12301224

1231-
12321225
class I2cSensor(Sensor):
12331226

12341227
"""
@@ -1238,10 +1231,10 @@ class I2cSensor(Sensor):
12381231
SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
12391232
SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
12401233

1241-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1234+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
12421235
if port is not None:
12431236
kwargs['port_name'] = port
1244-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['nxt-i2c-sensor', ], **kwargs )
1237+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['nxt-i2c-sensor'], **kwargs)
12451238

12461239
#~autogen
12471240
#~autogen python_generic-get-set classes.i2cSensor>currentClass
@@ -1273,7 +1266,6 @@ def poll_ms(self, value):
12731266
#~autogen
12741267
#~autogen python_generic-class classes.colorSensor>currentClass
12751268

1276-
12771269
class ColorSensor(Sensor):
12781270

12791271
"""
@@ -1283,10 +1275,10 @@ class ColorSensor(Sensor):
12831275
SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
12841276
SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
12851277

1286-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1278+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
12871279
if port is not None:
12881280
kwargs['port_name'] = port
1289-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-color', ], **kwargs )
1281+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-color'], **kwargs)
12901282

12911283
#~autogen
12921284
#~autogen python_generic-property-value classes.colorSensor>currentClass
@@ -1310,7 +1302,6 @@ def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
13101302
#~autogen
13111303
#~autogen python_generic-class classes.ultrasonicSensor>currentClass
13121304

1313-
13141305
class UltrasonicSensor(Sensor):
13151306

13161307
"""
@@ -1320,10 +1311,10 @@ class UltrasonicSensor(Sensor):
13201311
SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
13211312
SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
13221313

1323-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1314+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
13241315
if port is not None:
13251316
kwargs['port_name'] = port
1326-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-us', 'lego-nxt-us', ], **kwargs )
1317+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-us', 'lego-nxt-us'], **kwargs)
13271318

13281319
#~autogen
13291320
#~autogen python_generic-property-value classes.ultrasonicSensor>currentClass
@@ -1351,7 +1342,6 @@ def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
13511342
#~autogen
13521343
#~autogen python_generic-class classes.gyroSensor>currentClass
13531344

1354-
13551345
class GyroSensor(Sensor):
13561346

13571347
"""
@@ -1361,10 +1351,10 @@ class GyroSensor(Sensor):
13611351
SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
13621352
SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
13631353

1364-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1354+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
13651355
if port is not None:
13661356
kwargs['port_name'] = port
1367-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-gyro', ], **kwargs )
1357+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-gyro'], **kwargs)
13681358

13691359
#~autogen
13701360
#~autogen python_generic-property-value classes.gyroSensor>currentClass
@@ -1388,7 +1378,6 @@ def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
13881378
#~autogen
13891379
#~autogen python_generic-class classes.infraredSensor>currentClass
13901380

1391-
13921381
class InfraredSensor(Sensor):
13931382

13941383
"""
@@ -1398,10 +1387,10 @@ class InfraredSensor(Sensor):
13981387
SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
13991388
SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
14001389

1401-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1390+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
14021391
if port is not None:
14031392
kwargs['port_name'] = port
1404-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-ir', ], **kwargs )
1393+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-ir'], **kwargs)
14051394

14061395
#~autogen
14071396
#~autogen python_generic-property-value classes.infraredSensor>currentClass
@@ -1427,7 +1416,6 @@ def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
14271416

14281417
#~autogen python_generic-class classes.soundSensor>currentClass
14291418

1430-
14311419
class SoundSensor(Sensor):
14321420

14331421
"""
@@ -1437,10 +1425,10 @@ class SoundSensor(Sensor):
14371425
SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
14381426
SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
14391427

1440-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1428+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
14411429
if port is not None:
14421430
kwargs['port_name'] = port
1443-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-nxt-sound', ], **kwargs )
1431+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-nxt-sound'], **kwargs)
14441432

14451433
#~autogen
14461434
#~autogen python_generic-property-value classes.soundSensor>currentClass
@@ -1455,7 +1443,6 @@ def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
14551443
#~autogen
14561444
#~autogen python_generic-class classes.lightSensor>currentClass
14571445

1458-
14591446
class LightSensor(Sensor):
14601447

14611448
"""
@@ -1465,10 +1452,10 @@ class LightSensor(Sensor):
14651452
SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
14661453
SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
14671454

1468-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1455+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
14691456
if port is not None:
14701457
kwargs['port_name'] = port
1471-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-nxt-light', ], **kwargs )
1458+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-nxt-light'], **kwargs)
14721459

14731460
#~autogen
14741461
#~autogen python_generic-property-value classes.lightSensor>currentClass
@@ -1483,7 +1470,6 @@ def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
14831470
#~autogen
14841471
#~autogen python_generic-class classes.touchSensor>currentClass
14851472

1486-
14871473
class TouchSensor(Sensor):
14881474

14891475
"""
@@ -1493,15 +1479,14 @@ class TouchSensor(Sensor):
14931479
SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
14941480
SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
14951481

1496-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1482+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
14971483
if port is not None:
14981484
kwargs['port_name'] = port
1499-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-touch', 'lego-nxt-touch', ], **kwargs )
1485+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, driver_name=['lego-ev3-touch', 'lego-nxt-touch'], **kwargs)
15001486

15011487
#~autogen
15021488
#~autogen python_generic-class classes.led>currentClass
15031489

1504-
15051490
class Led(Device):
15061491

15071492
"""
@@ -1513,10 +1498,10 @@ class Led(Device):
15131498
SYSTEM_CLASS_NAME = 'leds'
15141499
SYSTEM_DEVICE_NAME_CONVENTION = '*'
15151500

1516-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1501+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
15171502
if port is not None:
15181503
kwargs['port_name'] = port
1519-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, **kwargs )
1504+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, **kwargs)
15201505

15211506
#~autogen
15221507
#~autogen python_generic-get-set classes.led>currentClass
@@ -1719,7 +1704,6 @@ def Led_all_off():
17191704
#~autogen
17201705
#~autogen python_generic-class classes.powerSupply>currentClass
17211706

1722-
17231707
class PowerSupply(Device):
17241708

17251709
"""
@@ -1730,10 +1714,10 @@ class PowerSupply(Device):
17301714
SYSTEM_CLASS_NAME = 'power_supply'
17311715
SYSTEM_DEVICE_NAME_CONVENTION = '*'
17321716

1733-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1717+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
17341718
if port is not None:
17351719
kwargs['port_name'] = port
1736-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, **kwargs )
1720+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, **kwargs)
17371721

17381722
#~autogen
17391723
#~autogen python_generic-get-set classes.powerSupply>currentClass
@@ -1781,7 +1765,6 @@ def type(self):
17811765
#~autogen
17821766
#~autogen python_generic-class classes.legoPort>currentClass
17831767

1784-
17851768
class LegoPort(Device):
17861769

17871770
"""
@@ -1815,10 +1798,10 @@ class LegoPort(Device):
18151798
SYSTEM_CLASS_NAME = 'lego_port'
18161799
SYSTEM_DEVICE_NAME_CONVENTION = '*'
18171800

1818-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
1801+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
18191802
if port is not None:
18201803
kwargs['port_name'] = port
1821-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name, **kwargs )
1804+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name, **kwargs)
18221805

18231806
#~autogen
18241807
#~autogen python_generic-get-set classes.legoPort>currentClass

‎templates/python_generic-class.liquid‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@ if currentClass.inheritance %}{%
99
assign base_class = currentClass.inheritance | camel_case | capitalize %}{%
1010
else %}{%
1111
assign base_class = 'Device' %}{%
12-
endif%}
13-
12+
endif%}{%
13+
assign driver_name = "" %}{%
14+
if currentClass.driverName %}{%
15+
for name in currentClass.driverName %}{%
16+
capture driver_name %}{{ driver_name }}, '{{name}}'{% endcapture %}{%
17+
endfor %}{%
18+
capture driver_name %} driver_name=[{{ driver_name | remove_first:', ' }}],{% endcapture %}{%
19+
endif %}
1420
class {{ class_name }}({{ base_class }}):
1521

1622
"""{% for line in currentClass.description %}
@@ -23,11 +29,7 @@ class {{ class_name }}({{ base_class }}):
2329
SYSTEM_CLASS_NAME = '{{ currentClass.systemClassName }}'
2430
SYSTEM_DEVICE_NAME_CONVENTION = '{{ device_name_convention }}'
2531
{% endif %}
26-
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs ):
32+
def __init__(self, port=None, name=SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
2733
if port is not None:
2834
kwargs['port_name'] = port
29-
Device.__init__( self, self.SYSTEM_CLASS_NAME, name{%
30-
if currentClass.driverName %}, driver_name=[{%
31-
for name in currentClass.driverName %}'{{name}}', {%
32-
endfor %}]{%
33-
endif %}, **kwargs )
35+
Device.__init__(self, self.SYSTEM_CLASS_NAME, name,{{ driver_name }} **kwargs)

0 commit comments

Comments
 (0)