Fix new argument access and tests

openSUSE · Mar 21, 2024 · 19156aa · 19156aa
1 parent e57308d
commit 19156aa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/py2pack/__init__.py b/py2pack/__init__.py
@@ -358,10 +358,8 @@ def generate(args):
     tr = str.maketrans('-.', '__')
     version = args.version
     name = args.name
-    try:
-        source_glob = args.source_glob
-    except AttributeError:
-        source_glob = '%{name}-%{version}.*'
+    default_source = '%{name}-%{version}.*'
+    source_glob = args.source_glob or default_source
     data_name = data['name'] or name
 
     tarball_file = []
@@ -396,11 +394,8 @@ def generate(args):
 
 
 def fetch_data(args):
-    try:
-        localfile = args.localfile
-        local = args.local
-    except AttributeError:
-        localfile = local = ''
+    localfile = args.localfile
+    local = args.local
 
     if not localfile and local:
         localfile = f'{args.name}.egg-info/PKG-INFO'

diff --git a/test/test_py2pack.py b/test/test_py2pack.py
@@ -31,6 +31,9 @@ class Args:
             name = "py2pack"
             version = "0.4.4"
             source_url = None
+            source_glob = None
+            local = False
+            localfile = ""
 
         self.args = Args()
 

diff --git a/test/test_template.py b/test/test_template.py
@@ -33,6 +33,9 @@ class Args(object):
     name = ''
     version = ''
     source_url = None
+    source_glob = None
+    local = False
+    localfile = ''
 
 
 compare_dir = os.path.join(os.path.dirname(__file__), 'examples')