Skip to content

Commit c69ec31

Browse files
CamoDunnCamoDunn
authored
Changed References to package.path - pyinstaller support Issue meraki#187 (meraki#188)
* Changed References from folder structure to package.path - pyinstaller support Changes: 1. Updated Meraki and Meraki_v0 to look back at package for reference instead of backing through folder structure. This will provide support for pyinstaller. Updated Example "apiData2CSV_v1.py" It was still looking for package meraki_v1 which has been renamed to meraki. * Update __init__.py
1 parent 4e32708 commit c69ec31

10 files changed

Lines changed: 212 additions & 212 deletions

File tree

‎examples/apiData2CSV_v1.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import argparse
66
import sys
77

8-
import meraki_v1
8+
import meraki
99

1010
import urllib.parse
1111
import platform
@@ -29,7 +29,7 @@
2929

3030
def main(org_id, timespan):
3131
# Instantiate a Meraki dashboard API session
32-
dashboard = meraki_v1.DashboardAPI(
32+
dashboard = meraki.DashboardAPI(
3333
base_url='https://api.meraki.com/api/v1/',
3434
print_console=False,
3535
output_log=False,

‎meraki/__init__.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
import logging
33
import os
44

5-
from .rest_session import *
6-
from .api.organizations import Organizations
7-
from .api.networks import Networks
8-
from .api.devices import Devices
9-
from .api.appliance import Appliance
10-
from .api.camera import Camera
11-
from .api.cellularGateway import CellularGateway
12-
from .api.insight import Insight
13-
from .api.sensor import Sensor
14-
from .api.sm import Sm
15-
from .api.switch import Switch
16-
from .api.wireless import Wireless
5+
from meraki.rest_session import *
6+
from meraki.api.organizations import Organizations
7+
from meraki.api.networks import Networks
8+
from meraki.api.devices import Devices
9+
from meraki.api.appliance import Appliance
10+
from meraki.api.camera import Camera
11+
from meraki.api.cellularGateway import CellularGateway
12+
from meraki.api.insight import Insight
13+
from meraki.api.sensor import Sensor
14+
from meraki.api.sm import Sm
15+
from meraki.api.switch import Switch
16+
from meraki.api.wireless import Wireless
1717

1818
# Batch class imports
19-
from .api.batch import Batch
19+
from meraki.api.batch import Batch
2020

2121
# Config import
22-
from .config import (
22+
from meraki.config import (
2323
API_KEY_ENVIRONMENT_VARIABLE,
2424
DEFAULT_BASE_URL,
2525
SINGLE_REQUEST_TIMEOUT,

‎meraki/aio/__init__.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
import os
33
from datetime import datetime
44

5-
from .rest_session import *
6-
from .api.appliance import AsyncAppliance
7-
from .api.camera import AsyncCamera
8-
from .api.cellularGateway import AsyncCellularGateway
9-
from .api.devices import AsyncDevices
10-
from .api.insight import AsyncInsight
11-
from .api.networks import AsyncNetworks
12-
from .api.organizations import AsyncOrganizations
13-
from .api.sensor import AsyncSensor
14-
from .api.sm import AsyncSm
15-
from .api.switch import AsyncSwitch
16-
from .api.wireless import AsyncWireless
5+
from meraki.aio.rest_session import *
6+
from meraki.aio.api.appliance import AsyncAppliance
7+
from meraki.aio.api.camera import AsyncCamera
8+
from meraki.aio.api.cellularGateway import AsyncCellularGateway
9+
from meraki.aio.api.devices import AsyncDevices
10+
from meraki.aio.api.insight import AsyncInsight
11+
from meraki.aio.api.networks import AsyncNetworks
12+
from meraki.aio.api.organizations import AsyncOrganizations
13+
from meraki.aio.api.sensor import AsyncSensor
14+
from meraki.aio.api.sm import AsyncSm
15+
from meraki.aio.api.switch import AsyncSwitch
16+
from meraki.aio.api.wireless import AsyncWireless
1717

1818
# Batch class imports
19-
from ..api.batch import Batch
19+
from meraki.api.batch import Batch
2020

2121
# Config import
22-
from ..config import (
22+
from meraki.config import (
2323
API_KEY_ENVIRONMENT_VARIABLE,
2424
DEFAULT_BASE_URL,
2525
SINGLE_REQUEST_TIMEOUT,

‎meraki/aio/rest_session.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
import aiohttp
1111

12-
from ..__init__ import __version__
13-
from ..config import *
14-
from ..exceptions import *
15-
from ..rest_session import user_agent_extended
12+
from meraki.__init__ import __version__
13+
from meraki.config import *
14+
from meraki.exceptions import *
15+
from meraki.rest_session import user_agent_extended
1616

1717

1818
# Main module interface

‎meraki/api/batch/__init__.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
from .organizations import ActionBatchOrganizations
2-
from .networks import ActionBatchNetworks
3-
from .devices import ActionBatchDevices
4-
from .appliance import ActionBatchAppliance
5-
from .camera import ActionBatchCamera
6-
from .cellularGateway import ActionBatchCellularGateway
7-
from .insight import ActionBatchInsight
8-
from .sensor import ActionBatchSensor
9-
from .sm import ActionBatchSm
10-
from .switch import ActionBatchSwitch
11-
from .wireless import ActionBatchWireless
1+
from meraki.api.batch.organizations import ActionBatchOrganizations
2+
from meraki.api.batch.networks import ActionBatchNetworks
3+
from meraki.api.batch.devices import ActionBatchDevices
4+
from meraki.api.batch.appliance import ActionBatchAppliance
5+
from meraki.api.batch.camera import ActionBatchCamera
6+
from meraki.api.batch.cellularGateway import ActionBatchCellularGateway
7+
from meraki.api.batch.insight import ActionBatchInsight
8+
from meraki.api.batch.sensor import ActionBatchSensor
9+
from meraki.api.batch.sm import ActionBatchSm
10+
from meraki.api.batch.switch import ActionBatchSwitch
11+
from meraki.api.batch.wireless import ActionBatchWireless
1212

1313

1414
# Batch class

‎meraki/rest_session.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import requests
1010

11-
from .config import *
12-
from .exceptions import *
13-
from .__init__ import __version__
11+
from meraki.config import *
12+
from meraki.exceptions import *
13+
from meraki.__init__ import __version__
1414

1515

1616
def user_agent_extended(be_geo_id, caller):

‎meraki_v0/__init__.py‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -2,85 +2,85 @@
22
import logging
33
import os
44

5-
from .legacy import *
6-
from .rest_session import *
7-
from .api.api_usage import APIUsage
8-
from .api.action_batches import ActionBatches
9-
from .api.admins import Admins
10-
from .api.alert_settings import AlertSettings
11-
from .api.bluetooth_clients import BluetoothClients
12-
from .api.bluetooth_settings import BluetoothSettings
13-
from .api.camera_quality_retention_profiles import CameraQualityRetentionProfiles
14-
from .api.cameras import Cameras
15-
from .api.change_log import ChangeLog
16-
from .api.clients import Clients
17-
from .api.config_templates import ConfigTemplates
18-
from .api.connectivity_monitoring_destinations import ConnectivityMonitoringDestinations
19-
from .api.content_filtering_categories import ContentFilteringCategories
20-
from .api.content_filtering_rules import ContentFilteringRules
21-
from .api.dashboard_branding_policies import DashboardBrandingPolicies
22-
from .api.devices import Devices
23-
from .api.events import Events
24-
from .api.firewalled_services import FirewalledServices
25-
from .api.floor_plans import FloorPlans
26-
from .api.group_policies import GroupPolicies
27-
from .api.http_servers import HTTPServers
28-
from .api.intrusion_settings import IntrusionSettings
29-
from .api.licenses import Licenses
30-
from .api.link_aggregations import LinkAggregations
31-
from .api.mg_dhcp_settings import MGDHCPSettings
32-
from .api.mg_lan_settings import MGLANSettings
33-
from .api.mg_connectivity_monitoring_destinations import MGConnectivityMonitoringDestinations
34-
from .api.mg_port_forwarding_rules import MGPortForwardingRules
35-
from .api.mg_subnet_pool_settings import MGSubnetPoolSettings
36-
from .api.mg_uplink_settings import MGUplinkSettings
37-
from .api.mr_l3_firewall import MRL3Firewall
38-
from .api.mv_sense import MVSense
39-
from .api.mx_1_1_nat_rules import MX11NATRules
40-
from .api.mx_1_many_nat_rules import MX1ManyNATRules
41-
from .api.mx_l3_firewall import MXL3Firewall
42-
from .api.mx_l7_application_categories import MXL7ApplicationCategories
43-
from .api.mx_l7_firewall import MXL7Firewall
44-
from .api.mx_vlan_ports import MXVLANPorts
45-
from .api.mx_vpn_firewall import MXVPNFirewall
46-
from .api.mx_cellular_firewall import MXCellularFirewall
47-
from .api.mx_inbound_firewall import MXInboundFirewall
48-
from .api.mx_port_forwarding_rules import MXPortForwardingRules
49-
from .api.mx_static_routes import MXStaticRoutes
50-
from .api.mx_warm_spare_settings import MXWarmSpareSettings
51-
from .api.malware_settings import MalwareSettings
52-
from .api.management_interface_settings import ManagementInterfaceSettings
53-
from .api.meraki_auth_users import MerakiAuthUsers
54-
from .api.monitored_media_servers import MonitoredMediaServers
55-
from .api.named_tag_scope import NamedTagScope
56-
from .api.netflow_settings import NetFlowSettings
57-
from .api.networks import Networks
58-
from .api.openapi_spec import OpenAPISpec
59-
from .api.organizations import Organizations
60-
from .api.pii import PII
61-
from .api.radio_settings import RadioSettings
62-
from .api.saml_roles import SAMLRoles
63-
from .api.sm import SM
64-
from .api.snmp_settings import SNMPSettings
65-
from .api.ssids import SSIDs
66-
from .api.security_events import SecurityEvents
67-
from .api.splash_login_attempts import SplashLoginAttempts
68-
from .api.splash_settings import SplashSettings
69-
from .api.switch_acls import SwitchACLs
70-
from .api.switch_port_schedules import SwitchPortSchedules
71-
from .api.switch_ports import SwitchPorts
72-
from .api.switch_profiles import SwitchProfiles
73-
from .api.switch_settings import SwitchSettings
74-
from .api.switch_stacks import SwitchStacks
75-
from .api.syslog_servers import SyslogServers
76-
from .api.traffic_analysis_settings import TrafficAnalysisSettings
77-
from .api.traffic_shaping import TrafficShaping
78-
from .api.uplink_settings import UplinkSettings
79-
from .api.vlans import VLANs
80-
from .api.webhook_logs import WebhookLogs
81-
from .api.wireless_health import WirelessHealth
82-
from .api.wireless_settings import WirelessSettings
83-
from .config import (
5+
from meraki_v0.legacy import *
6+
from meraki_v0.rest_session import *
7+
from meraki_v0.api.api_usage import APIUsage
8+
from meraki_v0.api.action_batches import ActionBatches
9+
from meraki_v0.api.admins import Admins
10+
from meraki_v0.api.alert_settings import AlertSettings
11+
from meraki_v0.api.bluetooth_clients import BluetoothClients
12+
from meraki_v0.api.bluetooth_settings import BluetoothSettings
13+
from meraki_v0.api.camera_quality_retention_profiles import CameraQualityRetentionProfiles
14+
from meraki_v0.api.cameras import Cameras
15+
from meraki_v0.api.change_log import ChangeLog
16+
from meraki_v0.api.clients import Clients
17+
from meraki_v0.api.config_templates import ConfigTemplates
18+
from meraki_v0.api.connectivity_monitoring_destinations import ConnectivityMonitoringDestinations
19+
from meraki_v0.api.content_filtering_categories import ContentFilteringCategories
20+
from meraki_v0.api.content_filtering_rules import ContentFilteringRules
21+
from meraki_v0.api.dashboard_branding_policies import DashboardBrandingPolicies
22+
from meraki_v0.api.devices import Devices
23+
from meraki_v0.api.events import Events
24+
from meraki_v0.api.firewalled_services import FirewalledServices
25+
from meraki_v0.api.floor_plans import FloorPlans
26+
from meraki_v0.api.group_policies import GroupPolicies
27+
from meraki_v0.api.http_servers import HTTPServers
28+
from meraki_v0.api.intrusion_settings import IntrusionSettings
29+
from meraki_v0.api.licenses import Licenses
30+
from meraki_v0.api.link_aggregations import LinkAggregations
31+
from meraki_v0.api.mg_dhcp_settings import MGDHCPSettings
32+
from meraki_v0.api.mg_lan_settings import MGLANSettings
33+
from meraki_v0.api.mg_connectivity_monitoring_destinations import MGConnectivityMonitoringDestinations
34+
from meraki_v0.api.mg_port_forwarding_rules import MGPortForwardingRules
35+
from meraki_v0.api.mg_subnet_pool_settings import MGSubnetPoolSettings
36+
from meraki_v0.api.mg_uplink_settings import MGUplinkSettings
37+
from meraki_v0.api.mr_l3_firewall import MRL3Firewall
38+
from meraki_v0.api.mv_sense import MVSense
39+
from meraki_v0.api.mx_1_1_nat_rules import MX11NATRules
40+
from meraki_v0.api.mx_1_many_nat_rules import MX1ManyNATRules
41+
from meraki_v0.api.mx_l3_firewall import MXL3Firewall
42+
from meraki_v0.api.mx_l7_application_categories import MXL7ApplicationCategories
43+
from meraki_v0.api.mx_l7_firewall import MXL7Firewall
44+
from meraki_v0.api.mx_vlan_ports import MXVLANPorts
45+
from meraki_v0.api.mx_vpn_firewall import MXVPNFirewall
46+
from meraki_v0.api.mx_cellular_firewall import MXCellularFirewall
47+
from meraki_v0.api.mx_inbound_firewall import MXInboundFirewall
48+
from meraki_v0.api.mx_port_forwarding_rules import MXPortForwardingRules
49+
from meraki_v0.api.mx_static_routes import MXStaticRoutes
50+
from meraki_v0.api.mx_warm_spare_settings import MXWarmSpareSettings
51+
from meraki_v0.api.malware_settings import MalwareSettings
52+
from meraki_v0.api.management_interface_settings import ManagementInterfaceSettings
53+
from meraki_v0.api.meraki_auth_users import MerakiAuthUsers
54+
from meraki_v0.api.monitored_media_servers import MonitoredMediaServers
55+
from meraki_v0.api.named_tag_scope import NamedTagScope
56+
from meraki_v0.api.netflow_settings import NetFlowSettings
57+
from meraki_v0.api.networks import Networks
58+
from meraki_v0.api.openapi_spec import OpenAPISpec
59+
from meraki_v0.api.organizations import Organizations
60+
from meraki_v0.api.pii import PII
61+
from meraki_v0.api.radio_settings import RadioSettings
62+
from meraki_v0.api.saml_roles import SAMLRoles
63+
from meraki_v0.api.sm import SM
64+
from meraki_v0.api.snmp_settings import SNMPSettings
65+
from meraki_v0.api.ssids import SSIDs
66+
from meraki_v0.api.security_events import SecurityEvents
67+
from meraki_v0.api.splash_login_attempts import SplashLoginAttempts
68+
from meraki_v0.api.splash_settings import SplashSettings
69+
from meraki_v0.api.switch_acls import SwitchACLs
70+
from meraki_v0.api.switch_port_schedules import SwitchPortSchedules
71+
from meraki_v0.api.switch_ports import SwitchPorts
72+
from meraki_v0.api.switch_profiles import SwitchProfiles
73+
from meraki_v0.api.switch_settings import SwitchSettings
74+
from meraki_v0.api.switch_stacks import SwitchStacks
75+
from meraki_v0.api.syslog_servers import SyslogServers
76+
from meraki_v0.api.traffic_analysis_settings import TrafficAnalysisSettings
77+
from meraki_v0.api.traffic_shaping import TrafficShaping
78+
from meraki_v0.api.uplink_settings import UplinkSettings
79+
from meraki_v0.api.vlans import VLANs
80+
from meraki_v0.api.webhook_logs import WebhookLogs
81+
from meraki_v0.api.wireless_health import WirelessHealth
82+
from meraki_v0.api.wireless_settings import WirelessSettings
83+
from meraki_v0.config import (
8484
API_KEY_ENVIRONMENT_VARIABLE, DEFAULT_BASE_URL, SINGLE_REQUEST_TIMEOUT, CERTIFICATE_PATH, REQUESTS_PROXY,
8585
WAIT_ON_RATE_LIMIT, NGINX_429_RETRY_WAIT_TIME, ACTION_BATCH_RETRY_WAIT_TIME, RETRY_4XX_ERROR,
8686
RETRY_4XX_ERROR_WAIT_TIME, MAXIMUM_RETRIES, OUTPUT_LOG, LOG_PATH, LOG_FILE_PREFIX, PRINT_TO_CONSOLE,

0 commit comments

Comments
 (0)