Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7321514

Browse files
jackjansenjackjansen
committed
Fixed bug in optional argument error checking (and generated all
suites anew).
1 parent a1db48b commit 7321514

5 files changed

Lines changed: 322 additions & 381 deletions

File tree

‎Mac/Lib/toolbox/AppleScript_Suite.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ def activate(self, _no_object=None, _attributes={}, **_arguments):
4343
_code = 'misc'
4444
_subcode = 'actv'
4545

46+
if _arguments: raise TypeError, 'No optional args expected'
4647
if _no_object != None: raise TypeError, 'No direct arg expected'
4748

48-
if _arguments: raise TypeError, 'No optional args expected'
4949

5050
_reply, _arguments, _attributes = self.send(_code, _subcode,
5151
_arguments, _attributes)
@@ -63,9 +63,9 @@ def log(self, _object, _attributes={}, **_arguments):
6363
_code = 'ascr'
6464
_subcode = 'cmnt'
6565

66+
if _arguments: raise TypeError, 'No optional args expected'
6667
_arguments['----'] = _object
6768

68-
if _arguments: raise TypeError, 'No optional args expected'
6969

7070
_reply, _arguments, _attributes = self.send(_code, _subcode,
7171
_arguments, _attributes)
@@ -82,9 +82,9 @@ def stop_log(self, _no_object=None, _attributes={}, **_arguments):
8282
_code = 'ToyS'
8383
_subcode = 'log0'
8484

85+
if _arguments: raise TypeError, 'No optional args expected'
8586
if _no_object != None: raise TypeError, 'No direct arg expected'
8687

87-
if _arguments: raise TypeError, 'No optional args expected'
8888

8989
_reply, _arguments, _attributes = self.send(_code, _subcode,
9090
_arguments, _attributes)
@@ -101,9 +101,9 @@ def start_log(self, _no_object=None, _attributes={}, **_arguments):
101101
_code = 'ToyS'
102102
_subcode = 'log1'
103103

104+
if _arguments: raise TypeError, 'No optional args expected'
104105
if _no_object != None: raise TypeError, 'No direct arg expected'
105106

106-
if _arguments: raise TypeError, 'No optional args expected'
107107

108108
_reply, _arguments, _attributes = self.send(_code, _subcode,
109109
_arguments, _attributes)
@@ -120,9 +120,9 @@ def copy(self, _no_object=None, _attributes={}, **_arguments):
120120
_code = 'misc'
121121
_subcode = 'copy'
122122

123+
if _arguments: raise TypeError, 'No optional args expected'
123124
if _no_object != None: raise TypeError, 'No direct arg expected'
124125

125-
if _arguments: raise TypeError, 'No optional args expected'
126126

127127
_reply, _arguments, _attributes = self.send(_code, _subcode,
128128
_arguments, _attributes)
@@ -141,9 +141,9 @@ def do_script(self, _object, _attributes={}, **_arguments):
141141
_code = 'misc'
142142
_subcode = 'dosc'
143143

144+
if _arguments: raise TypeError, 'No optional args expected'
144145
_arguments['----'] = _object
145146

146-
if _arguments: raise TypeError, 'No optional args expected'
147147

148148
_reply, _arguments, _attributes = self.send(_code, _subcode,
149149
_arguments, _attributes)
@@ -161,9 +161,9 @@ def idle(self, _no_object=None, _attributes={}, **_arguments):
161161
_code = 'misc'
162162
_subcode = 'idle'
163163

164+
if _arguments: raise TypeError, 'No optional args expected'
164165
if _no_object != None: raise TypeError, 'No direct arg expected'
165166

166-
if _arguments: raise TypeError, 'No optional args expected'
167167

168168
_reply, _arguments, _attributes = self.send(_code, _subcode,
169169
_arguments, _attributes)
@@ -181,9 +181,9 @@ def launch(self, _no_object=None, _attributes={}, **_arguments):
181181
_code = 'ascr'
182182
_subcode = 'noop'
183183

184+
if _arguments: raise TypeError, 'No optional args expected'
184185
if _no_object != None: raise TypeError, 'No direct arg expected'
185186

186-
if _arguments: raise TypeError, 'No optional args expected'
187187

188188
_reply, _arguments, _attributes = self.send(_code, _subcode,
189189
_arguments, _attributes)
@@ -201,9 +201,9 @@ def tell(self, _no_object=None, _attributes={}, **_arguments):
201201
_code = 'ascr'
202202
_subcode = 'tell'
203203

204+
if _arguments: raise TypeError, 'No optional args expected'
204205
if _no_object != None: raise TypeError, 'No direct arg expected'
205206

206-
if _arguments: raise TypeError, 'No optional args expected'
207207

208208
_reply, _arguments, _attributes = self.send(_code, _subcode,
209209
_arguments, _attributes)
@@ -221,9 +221,9 @@ def end_tell(self, _no_object=None, _attributes={}, **_arguments):
221221
_code = 'ascr'
222222
_subcode = 'tend'
223223

224+
if _arguments: raise TypeError, 'No optional args expected'
224225
if _no_object != None: raise TypeError, 'No direct arg expected'
225226

226-
if _arguments: raise TypeError, 'No optional args expected'
227227

228228
_reply, _arguments, _attributes = self.send(_code, _subcode,
229229
_arguments, _attributes)
@@ -253,9 +253,9 @@ def error(self, _object=None, _attributes={}, **_arguments):
253253
_code = 'ascr'
254254
_subcode = 'err '
255255

256+
aetools.keysubst(_arguments, self._argmap_error)
256257
_arguments['----'] = _object
257258

258-
aetools.keysubst(_arguments, self._argmap_error)
259259

260260
_reply, _arguments, _attributes = self.send(_code, _subcode,
261261
_arguments, _attributes)
@@ -337,9 +337,9 @@ def Call_a5_subroutine(self, _object=None, _attributes={}, **_arguments):
337337
_code = 'ascr'
338338
_subcode = 'psbr'
339339

340+
aetools.keysubst(_arguments, self._argmap_Call_a5_subroutine)
340341
_arguments['----'] = _object
341342

342-
aetools.keysubst(_arguments, self._argmap_Call_a5_subroutine)
343343

344344
_reply, _arguments, _attributes = self.send(_code, _subcode,
345345
_arguments, _attributes)
@@ -358,9 +358,9 @@ def _3d_(self, _object, _attributes={}, **_arguments):
358358
_code = 'ascr'
359359
_subcode = '= '
360360

361+
if _arguments: raise TypeError, 'No optional args expected'
361362
_arguments['----'] = _object
362363

363-
if _arguments: raise TypeError, 'No optional args expected'
364364

365365
_reply, _arguments, _attributes = self.send(_code, _subcode,
366366
_arguments, _attributes)
@@ -379,9 +379,9 @@ def _ad_(self, _object, _attributes={}, **_arguments):
379379
_code = 'ascr'
380380
_subcode = '\255 '
381381

382+
if _arguments: raise TypeError, 'No optional args expected'
382383
_arguments['----'] = _object
383384

384-
if _arguments: raise TypeError, 'No optional args expected'
385385

386386
_reply, _arguments, _attributes = self.send(_code, _subcode,
387387
_arguments, _attributes)
@@ -400,9 +400,9 @@ def _2b_(self, _object, _attributes={}, **_arguments):
400400
_code = 'ascr'
401401
_subcode = '+ '
402402

403+
if _arguments: raise TypeError, 'No optional args expected'
403404
_arguments['----'] = _object
404405

405-
if _arguments: raise TypeError, 'No optional args expected'
406406

407407
_reply, _arguments, _attributes = self.send(_code, _subcode,
408408
_arguments, _attributes)
@@ -421,9 +421,9 @@ def _2d_(self, _object, _attributes={}, **_arguments):
421421
_code = 'ascr'
422422
_subcode = '- '
423423

424+
if _arguments: raise TypeError, 'No optional args expected'
424425
_arguments['----'] = _object
425426

426-
if _arguments: raise TypeError, 'No optional args expected'
427427

428428
_reply, _arguments, _attributes = self.send(_code, _subcode,
429429
_arguments, _attributes)
@@ -442,9 +442,9 @@ def _2a_(self, _object, _attributes={}, **_arguments):
442442
_code = 'ascr'
443443
_subcode = '* '
444444

445+
if _arguments: raise TypeError, 'No optional args expected'
445446
_arguments['----'] = _object
446447

447-
if _arguments: raise TypeError, 'No optional args expected'
448448

449449
_reply, _arguments, _attributes = self.send(_code, _subcode,
450450
_arguments, _attributes)
@@ -463,9 +463,9 @@ def _d6_(self, _object, _attributes={}, **_arguments):
463463
_code = 'ascr'
464464
_subcode = '/ '
465465

466+
if _arguments: raise TypeError, 'No optional args expected'
466467
_arguments['----'] = _object
467468

468-
if _arguments: raise TypeError, 'No optional args expected'
469469

470470
_reply, _arguments, _attributes = self.send(_code, _subcode,
471471
_arguments, _attributes)
@@ -484,9 +484,9 @@ def div(self, _object, _attributes={}, **_arguments):
484484
_code = 'ascr'
485485
_subcode = 'div '
486486

487+
if _arguments: raise TypeError, 'No optional args expected'
487488
_arguments['----'] = _object
488489

489-
if _arguments: raise TypeError, 'No optional args expected'
490490

491491
_reply, _arguments, _attributes = self.send(_code, _subcode,
492492
_arguments, _attributes)
@@ -505,9 +505,9 @@ def mod(self, _object, _attributes={}, **_arguments):
505505
_code = 'ascr'
506506
_subcode = 'mod '
507507

508+
if _arguments: raise TypeError, 'No optional args expected'
508509
_arguments['----'] = _object
509510

510-
if _arguments: raise TypeError, 'No optional args expected'
511511

512512
_reply, _arguments, _attributes = self.send(_code, _subcode,
513513
_arguments, _attributes)
@@ -526,9 +526,9 @@ def _5e_(self, _object, _attributes={}, **_arguments):
526526
_code = 'ascr'
527527
_subcode = '^ '
528528

529+
if _arguments: raise TypeError, 'No optional args expected'
529530
_arguments['----'] = _object
530531

531-
if _arguments: raise TypeError, 'No optional args expected'
532532

533533
_reply, _arguments, _attributes = self.send(_code, _subcode,
534534
_arguments, _attributes)
@@ -547,9 +547,9 @@ def _3e_(self, _object, _attributes={}, **_arguments):
547547
_code = 'ascr'
548548
_subcode = '> '
549549

550+
if _arguments: raise TypeError, 'No optional args expected'
550551
_arguments['----'] = _object
551552

552-
if _arguments: raise TypeError, 'No optional args expected'
553553

554554
_reply, _arguments, _attributes = self.send(_code, _subcode,
555555
_arguments, _attributes)
@@ -568,9 +568,9 @@ def _b3_(self, _object, _attributes={}, **_arguments):
568568
_code = 'ascr'
569569
_subcode = '>= '
570570

571+
if _arguments: raise TypeError, 'No optional args expected'
571572
_arguments['----'] = _object
572573

573-
if _arguments: raise TypeError, 'No optional args expected'
574574

575575
_reply, _arguments, _attributes = self.send(_code, _subcode,
576576
_arguments, _attributes)
@@ -589,9 +589,9 @@ def _3c_(self, _object, _attributes={}, **_arguments):
589589
_code = 'ascr'
590590
_subcode = '< '
591591

592+
if _arguments: raise TypeError, 'No optional args expected'
592593
_arguments['----'] = _object
593594

594-
if _arguments: raise TypeError, 'No optional args expected'
595595

596596
_reply, _arguments, _attributes = self.send(_code, _subcode,
597597
_arguments, _attributes)
@@ -610,9 +610,9 @@ def _b2_(self, _object, _attributes={}, **_arguments):
610610
_code = 'ascr'
611611
_subcode = '<= '
612612

613+
if _arguments: raise TypeError, 'No optional args expected'
613614
_arguments['----'] = _object
614615

615-
if _arguments: raise TypeError, 'No optional args expected'
616616

617617
_reply, _arguments, _attributes = self.send(_code, _subcode,
618618
_arguments, _attributes)
@@ -631,9 +631,9 @@ def _26_(self, _object, _attributes={}, **_arguments):
631631
_code = 'ascr'
632632
_subcode = 'ccat'
633633

634+
if _arguments: raise TypeError, 'No optional args expected'
634635
_arguments['----'] = _object
635636

636-
if _arguments: raise TypeError, 'No optional args expected'
637637

638638
_reply, _arguments, _attributes = self.send(_code, _subcode,
639639
_arguments, _attributes)
@@ -652,9 +652,9 @@ def starts_with(self, _object, _attributes={}, **_arguments):
652652
_code = 'ascr'
653653
_subcode = 'bgwt'
654654

655+
if _arguments: raise TypeError, 'No optional args expected'
655656
_arguments['----'] = _object
656657

657-
if _arguments: raise TypeError, 'No optional args expected'
658658

659659
_reply, _arguments, _attributes = self.send(_code, _subcode,
660660
_arguments, _attributes)
@@ -673,9 +673,9 @@ def ends_with(self, _object, _attributes={}, **_arguments):
673673
_code = 'ascr'
674674
_subcode = 'ends'
675675

676+
if _arguments: raise TypeError, 'No optional args expected'
676677
_arguments['----'] = _object
677678

678-
if _arguments: raise TypeError, 'No optional args expected'
679679

680680
_reply, _arguments, _attributes = self.send(_code, _subcode,
681681
_arguments, _attributes)
@@ -694,9 +694,9 @@ def contains(self, _object, _attributes={}, **_arguments):
694694
_code = 'ascr'
695695
_subcode = 'cont'
696696

697+
if _arguments: raise TypeError, 'No optional args expected'
697698
_arguments['----'] = _object
698699

699-
if _arguments: raise TypeError, 'No optional args expected'
700700

701701
_reply, _arguments, _attributes = self.send(_code, _subcode,
702702
_arguments, _attributes)
@@ -715,9 +715,9 @@ def _and(self, _object, _attributes={}, **_arguments):
715715
_code = 'ascr'
716716
_subcode = 'AND '
717717

718+
if _arguments: raise TypeError, 'No optional args expected'
718719
_arguments['----'] = _object
719720

720-
if _arguments: raise TypeError, 'No optional args expected'
721721

722722
_reply, _arguments, _attributes = self.send(_code, _subcode,
723723
_arguments, _attributes)
@@ -736,9 +736,9 @@ def _or(self, _object, _attributes={}, **_arguments):
736736
_code = 'ascr'
737737
_subcode = 'OR '
738738

739+
if _arguments: raise TypeError, 'No optional args expected'
739740
_arguments['----'] = _object
740741

741-
if _arguments: raise TypeError, 'No optional args expected'
742742

743743
_reply, _arguments, _attributes = self.send(_code, _subcode,
744744
_arguments, _attributes)
@@ -757,9 +757,9 @@ def as(self, _object, _attributes={}, **_arguments):
757757
_code = 'ascr'
758758
_subcode = 'coer'
759759

760+
if _arguments: raise TypeError, 'No optional args expected'
760761
_arguments['----'] = _object
761762

762-
if _arguments: raise TypeError, 'No optional args expected'
763763

764764
_reply, _arguments, _attributes = self.send(_code, _subcode,
765765
_arguments, _attributes)
@@ -778,9 +778,9 @@ def _not(self, _object, _attributes={}, **_arguments):
778778
_code = 'ascr'
779779
_subcode = 'NOT '
780780

781+
if _arguments: raise TypeError, 'No optional args expected'
781782
_arguments['----'] = _object
782783

783-
if _arguments: raise TypeError, 'No optional args expected'
784784

785785
_reply, _arguments, _attributes = self.send(_code, _subcode,
786786
_arguments, _attributes)
@@ -799,9 +799,9 @@ def negate(self, _object, _attributes={}, **_arguments):
799799
_code = 'ascr'
800800
_subcode = 'neg '
801801

802+
if _arguments: raise TypeError, 'No optional args expected'
802803
_arguments['----'] = _object
803804

804-
if _arguments: raise TypeError, 'No optional args expected'
805805

806806
_reply, _arguments, _attributes = self.send(_code, _subcode,
807807
_arguments, _attributes)

0 commit comments

Comments
 (0)