syvl.org / oreo
This repository has no description
0
Fork 0

Configure Feed

Select the types of activity you want to include in your feed.

Moved the bundle name assignment to the init method.

author
syvlorg date (Jun 15, 2025, 4:52 AM -0400) commit 3ec2c8a8 parent 456b4703
+17 -34
+1 -1
oreo/oreo.py
··· 177 177 stdprint(*args) 178 178 179 179 f.print = stdprint 180 - 180 + 181 181 # Adapted From: 182 182 # Answer: https://stackoverflow.com/a/49631500 183 183 # User: https://stackoverflow.com/users/379311/yann-vernier
+15 -30
packages/bundle/bundle/bundle.py
··· 619 619 def dunder_check(self, attr): 620 620 return not attr.startswith("__") or attr in ("__init__",) 621 621 622 - def process_click_kwargs(self, func, click_kwargs): 622 + def process_click_kwargs(self, func, *click_kwargs): 623 623 return Dict( 624 624 {"name": getattr(func, "__name__", "")} 625 625 | getattr(func, "__click_kwargs__", {}) 626 - ) | Dict(click_kwargs) 626 + ) | reduce(Dict.__or__, click_kwargs) 627 627 628 - def process_func(self, func, click_kwargs, named_kwargs): 629 - fclick_kwargs = self.process_click_kwargs(func, click_kwargs) 630 - if not fclick_kwargs.name: 631 - fclick_kwargs |= named_kwargs 628 + def process_func(self, func, *click_kwargs): 629 + fclick_kwargs = self.process_click_kwargs(func, *click_kwargs) 632 630 fname = fclick_kwargs["name"] 633 631 if not self.__name__ and fname: 634 632 self.__name__ = fname ··· 636 634 637 635 # TODO: Simplify and combine the various functions. 638 636 def pre_process_extend(self, func=None, *funcs, **click_kwargs): 639 - named_kwargs = {} 640 - # TODO: If I have to do this anyway, just put all this in `append`. 641 - if not self.__name__ and "name" in click_kwargs: 642 - self.__name__ = named_kwargs["name"] = getattr( 643 - click_kwargs, "pop" if funcs else "get" 644 - )("name") 645 637 fclick_kwargs_list = [] 646 638 new_funcs = [] 647 639 for f in (func, *funcs): ··· 653 645 fclick_kwargs_list.append( 654 646 self.process_func( 655 647 v, 656 - click_kwargs 657 - | {"name": f.__name__ if k == "__init__" else k}, 658 - named_kwargs, 648 + click_kwargs, 649 + {"name": f.__name__ if k == "__init__" else k}, 659 650 ) 660 651 ) 661 652 new_funcs.append(v) 662 653 else: 663 - fclick_kwargs_list.append( 664 - self.process_func(f, click_kwargs, named_kwargs) 665 - ) 654 + fclick_kwargs_list.append(self.process_func(f, click_kwargs)) 666 655 new_funcs.append(f) 667 656 else: 668 657 match f: 669 658 case bundle(): 670 - fclick_kwargs_list.append( 671 - self.process_func(f, click_kwargs, named_kwargs) 672 - ) 659 + fclick_kwargs_list.append(self.process_func(f, click_kwargs)) 673 660 new_funcs.append(f) 674 661 case dict(): 675 662 if funcs: 676 663 for k, v in f.items(): 677 664 if self.dunder_check(k): 678 665 fclick_kwargs_list.append( 679 - self.process_func( 680 - v, click_kwargs | {"name": k}, named_kwargs 681 - ) 666 + self.process_func(v, click_kwargs, {"name": k}) 682 667 ) 683 668 new_funcs.append(v) 684 669 else: 685 670 fclick_kwargs_list.append( 686 - self.process_func(f, click_kwargs, named_kwargs) 671 + self.process_func(f, click_kwargs) 687 672 ) 688 673 new_funcs.append(f) 689 674 case Hydreigon(): ··· 692 677 if funcs: 693 678 for item in f: 694 679 fclick_kwargs_list.append( 695 - self.process_func(item, click_kwargs, named_kwargs) 680 + self.process_func(item, click_kwargs) 696 681 ) 697 682 new_funcs.append(item) 698 683 else: 699 684 fclick_kwargs_list.append( 700 - self.process_func(f, click_kwargs, named_kwargs) 685 + self.process_func(f, click_kwargs) 701 686 ) 702 687 new_funcs.append(f) 703 688 case _: 704 - fclick_kwargs_list.append( 705 - self.process_func(f, click_kwargs, named_kwargs) 706 - ) 689 + fclick_kwargs_list.append(self.process_func(f, click_kwargs)) 707 690 new_funcs.append(f) 708 691 func, *funcs = new_funcs 709 692 result = self.append(func, processed_click_kwargs=fclick_kwargs_list[0]) ··· 733 716 default_va_annotation=typing.Any, default_vk_annotation=typing.Any 734 717 ) 735 718 self.__click_kwargs__ = Dict(click_kwargs) 719 + if funcs: 720 + click_kwargs.pop("name", None) 736 721 self.up(func, *funcs, **click_kwargs) 737 722 738 723 def process_append(self, func, fname, child):
-2
packages/bundle/bundle/tests/test_bundle.py
··· 431 431 __init__ = functions.g1s 432 432 433 433 pprint(b2f1) 434 - 435 - assert False 436 434 437 435 assert strings.f1 == b1f1 == b2f1 438 436
+1 -1
packages/jugulis/jugulis/tests/test_scoring.py
··· 282 282 283 283 def test_wrong_keyword_argument_type(self, e): 284 284 try: 285 - error = scorefunction(*e[1:], (0,), {"b":"0"}, e[0]) 285 + error = scorefunction(*e[1:], (0,), {"b": "0"}, e[0]) 286 286 except KeywordArgumentTypeError as te: 287 287 assert ( 288 288 str(te)