1
=== modified file 'click/commands/info.py'
2
--- click/commands/info.py	2014-04-03 08:52:02 +0000
3
+++ click/commands/info.py	2014-06-24 06:33:04 +0000
4
@@ -26,6 +26,13 @@
5
26
26
6
27
from click.install import DebFile
27
from click.install import DebFile
7
28
from click.json_helpers import json_object_to_python
28
from click.json_helpers import json_object_to_python
8
29
def _load_manifest(manifest_file):
9
30
    manifest = json.load(manifest_file)
10
31
    keys = list(manifest)
11
32
    for key in keys:
12
33
        if key.startswith("_"):
13
34
            del manifest[key]
14
35
    return manifest
15
29
36
16
30
37
17
31
def get_manifest(options, arg):
38
def get_manifest(options, arg):
18
@@ -38,15 +45,21 @@
19
38
        if registry.has_package_name(arg):
45
        if registry.has_package_name(arg):
20
39
            return json_object_to_python(registry.get_manifest(arg))
46
            return json_object_to_python(registry.get_manifest(arg))
21
40
47
31
41
    with closing(DebFile(filename=arg)) as package:
48
    if arg.endswith(".click"):
32
42
        with package.control.get_file(
49
        with closing(DebFile(filename=arg)) as package:
33
43
                "manifest", encoding="UTF-8") as manifest_file:
50
            with package.control.get_file(
34
44
            manifest = json.load(manifest_file)
51
                    "manifest", encoding="UTF-8") as manifest_file:
35
45
            keys = list(manifest)
52
                return _load_manifest(manifest_file)
36
46
            for key in keys:
53
    else:
37
47
                if key.startswith("_"):
54
        import glob, os
38
48
                    del manifest[key]
55
        pkgdir = Click.find_package_directory(arg)
39
49
            return manifest
56
        manifest_path = glob.glob(
40
57
            os.path.join(pkgdir, ".click", "info", "*.manifest"))
41
58
        if len(manifest_path) > 1:
42
59
            raise Exception("Multiple manifest files found in '%s'" % (
43
60
                manifest_path))
44
61
        with open(manifest_path[0]) as f:
45
62
            return _load_manifest(f)
46
50
63
47
51
64
48
52
def run(argv):
65
def run(argv):
Reviewer	Review Type	Date Requested	Status
Colin Watson		2014-06-24	Approve on 2014-08-08
PS Jenkins bot (community)	continuous-integration		Approve on 2014-06-25
Review via email: mp+224238@code.launchpad.net
1	=== modified file 'click/commands/info.py'
2	--- click/commands/info.py 2014-04-03 08:52:02 +0000
3	+++ click/commands/info.py 2014-06-24 06:33:04 +0000
4	@@ -26,6 +26,13 @@
5	26		26
6	27	from click.install import DebFile	27	from click.install import DebFile
7	28	from click.json_helpers import json_object_to_python	28	from click.json_helpers import json_object_to_python
8			29	def _load_manifest(manifest_file):
9			30	manifest = json.load(manifest_file)
10			31	keys = list(manifest)
11			32	for key in keys:
12			33	if key.startswith("_"):
13			34	del manifest[key]
14			35	return manifest
15	29		36
16	30		37
17	31	def get_manifest(options, arg):	38	def get_manifest(options, arg):
18	@@ -38,15 +45,21 @@
19	38	if registry.has_package_name(arg):	45	if registry.has_package_name(arg):
20	39	return json_object_to_python(registry.get_manifest(arg))	46	return json_object_to_python(registry.get_manifest(arg))
21	40		47
31	41	with closing(DebFile(filename=arg)) as package:	48	if arg.endswith(".click"):
32	42	with package.control.get_file(	49	with closing(DebFile(filename=arg)) as package:
33	43	"manifest", encoding="UTF-8") as manifest_file:	50	with package.control.get_file(
34	44	manifest = json.load(manifest_file)	51	"manifest", encoding="UTF-8") as manifest_file:
35	45	keys = list(manifest)	52	return _load_manifest(manifest_file)
36	46	for key in keys:	53	else:
37	47	if key.startswith("_"):	54	import glob, os
38	48	del manifest[key]	55	pkgdir = Click.find_package_directory(arg)
39	49	return manifest	56	manifest_path = glob.glob(
40			57	os.path.join(pkgdir, ".click", "info", "*.manifest"))
41			58	if len(manifest_path) > 1:
42			59	raise Exception("Multiple manifest files found in '%s'" % (
43			60	manifest_path))
44			61	with open(manifest_path[0]) as f:
45			62	return _load_manifest(f)
46	50		63
47	51		64
48	52	def run(argv):	65	def run(argv):