From 2c357a89af1106d150a12066288d20d628fcd29c Mon Sep 17 00:00:00 2001
From: mahtin <mahtin@mahtin.com>
Date: Fri, 17 Jun 2016 11:33:05 -0700
Subject: [PATCH] Fixed exceptions. Added -V for version.

---
 cli4/cli4.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/cli4/cli4.py b/cli4/cli4.py
index 2a93e1e..c3e96fc 100644
--- a/cli4/cli4.py
+++ b/cli4/cli4.py
@@ -13,13 +13,14 @@
 
 sys.path.insert(0, os.path.abspath('..'))
 import CloudFlare
+import CloudFlare.exceptions
 
 def convert_zones_to_identifier(cf, zone_name):
     """zone names to numbers"""
     params = {'name':zone_name, 'per_page':1}
     try:
         zones = cf.zones.get(params=params)
-    except CloudFlare.CloudFlareAPIError as e:
+    except CloudFlare.exceptions.CloudFlareAPIError as e:
         exit('cli4: %s - %d %s' % (zone_name, e, e))
     except Exception as e:
         exit('cli4: %s - %s' % (zone_name, e))
@@ -36,7 +37,7 @@ def convert_dns_record_to_identifier(cf, zone_id, dns_name):
     params = {'name':dns_name}
     try:
         dns_records = cf.zones.dns_records.get(zone_id, params=params)
-    except CloudFlare.CloudFlareAPIError as e:
+    except CloudFlare.exceptions.CloudFlareAPIError as e:
         exit('cli4: %s - %d %s' % (dns_name, e, e))
     except Exception as e:
         exit('cli4: %s - %s' % (dns_name, e))
@@ -54,7 +55,7 @@ def convert_certificates_to_identifier(cf, certificate_name):
     """certificate names to numbers"""
     try:
         certificates = cf.certificates.get()
-    except CloudFlare.CloudFlareAPIError as e:
+    except CloudFlare.exceptions.CloudFlareAPIError as e:
         exit('cli4: %s - %d %s' % (certificate_name, e, e))
     except Exception as e:
         exit('cli4: %s - %s' % (certificate_name, e))
@@ -69,7 +70,7 @@ def convert_organizations_to_identifier(cf, organization_name):
     """organizations names to numbers"""
     try:
         organizations = cf.user.organizations.get()
-    except CloudFlare.CloudFlareAPIError as e:
+    except CloudFlare.exceptions.CloudFlareAPIError as e:
         exit('cli4: %s - %d %s' % (organization_name, e, e))
     except Exception as e:
         exit('cli4: %s - %s' % (organization_name, e))
@@ -84,7 +85,7 @@ def convert_invites_to_identifier(cf, invite_name):
     """invite names to numbers"""
     try:
         invites = cf.user.invites.get()
-    except CloudFlare.CloudFlareAPIError as e:
+    except CloudFlare.exceptions.CloudFlareAPIError as e:
         exit('cli4: %s - %d %s' % (invite_name, e, e))
     except Exception as e:
         exit('cli4: %s - %s' % (invite_name, e))
@@ -99,7 +100,7 @@ def convert_virtual_dns_to_identifier(cf, virtual_dns_name):
     """virtual dns names to numbers"""
     try:
         virtual_dnss = cf.user.virtual_dns.get()
-    except CloudFlare.CloudFlareAPIError as e:
+    except CloudFlare.exceptions.CloudFlareAPIError as e:
         exit('cli4: %s - %d %s\n' % (virtual_dns_name, e, e))
     except Exception as e:
         exit('cli4: %s - %s\n' % (virtual_dns_name, e))
@@ -117,21 +118,24 @@ def cli4(args):
     output = 'json'
     method = 'GET'
 
-    usage = ('usage: cli4 [-h|--help] [-v|--verbose] [-q|--quiet] [-j|--json] [-y|--yaml]'
+    usage = ('usage: cli4 '
+             + '[-V|--version] [-h|--help] [-v|--verbose] [-q|--quiet] [-j|--json] [-y|--yaml]'
              + '[--get|--patch|--post|-put|--delete]'
              + '[item=value ...]'
              + '/command...')
 
     try:
         opts, args = getopt.getopt(args,
-                                   'hvqjyGPOUD',
+                                   'VhvqjyGPOUD',
                                    [
-                                       'help', 'verbose', 'quiet', 'json', 'yaml',
+                                       'help', 'version' 'verbose', 'quiet', 'json', 'yaml',
                                        'get', 'patch', 'post', 'put', 'delete'
                                    ])
     except getopt.GetoptError:
         exit(usage)
     for opt, arg in opts:
+        if opt in ('-V', '--version'):
+            exit('CloudFlare library version: %s' % (CloudFlare.__version__))
         if opt in ('-h', '--help'):
             exit(usage)
         elif opt in ('-v', '--verbose'):
@@ -267,7 +271,7 @@ def cli4(args):
                 r = m.delete(identifier1=identifier1, identifier2=i2, data=params)
             else:
                 pass
-        except CloudFlare.CloudFlareAPIError as e:
+        except CloudFlare.exceptions.CloudFlareAPIError as e:
             exit('cli4: /%s - %d %s' % (command, e, e))
         except Exception as e:
             exit('cli4: /%s - %s - api error' % (command, e))