Skip to content

Requests #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 83 commits into from
Aug 21, 2020
Merged

Requests #71

Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
54c7010
Add requests.
sheagcraig Apr 17, 2020
3b4f557
WS fix.
sheagcraig Apr 30, 2020
4ed8bbc
Add MacSesh package to sal-scripts Python requirements.txt.
sheagcraig May 1, 2020
ad08a51
Add SalClient class to replace curl func and related.
sheagcraig May 1, 2020
70c2910
Update preflight script to use requests.
sheagcraig May 1, 2020
f125703
Update machine_checkin model lookup to use requests.
sheagcraig May 1, 2020
ae2e502
Update sal-submit to use requests.
sheagcraig May 1, 2020
8a8d04e
Skip trying to execute py3 cache, and set up place to skip others.
sheagcraig May 1, 2020
d220a91
Handle json errors in checkin results by using an empty dict.
sheagcraig May 4, 2020
1e2089e
Move SalClient into its own module.
sheagcraig May 4, 2020
decd2fe
Move URL building to SalClient for sal-submit.
sheagcraig May 4, 2020
dce7853
Use SalClient URL builder for preflight.
sheagcraig May 4, 2020
01d1d34
Fix missed URL update to new SalClient.
sheagcraig May 4, 2020
7ba494c
Add module-private SalClient "singleton" for session reuse purposes.
sheagcraig May 4, 2020
45ceb7d
Remove unused import.
sheagcraig May 4, 2020
2a89112
Do a better job of handling requests exceptions.
sheagcraig May 4, 2020
02116b1
Remove now unused arg.
sheagcraig May 8, 2020
0deb41e
Rethink how `[In|Unin]stallResults` get merged into `ManagedItem`s.
sheagcraig May 8, 2020
06239ca
Add property for setting auth.
sheagcraig May 8, 2020
7192a82
Add commandline args to allow you to override ServerURL and key.
sheagcraig May 8, 2020
4569d02
Add prefs debug output.
sheagcraig May 8, 2020
88953bf
Do some processing client side so we don't send so much profile data.
sheagcraig May 8, 2020
673a0ec
Fix bug with downloading plugin scripts.
sheagcraig May 27, 2020
1a657c4
Fix executable script check in utils.
sheagcraig May 27, 2020
46e0785
Remove unused imports.
sheagcraig May 27, 2020
025ff84
Move preference setting code out of client and bump macsesh version.
sheagcraig May 27, 2020
068d3c2
Use new session name.
sheagcraig May 27, 2020
18ce3cb
Bump python version.
sheagcraig May 27, 2020
6326022
Add pref-based client setup code into new mac_utils module.
sheagcraig May 27, 2020
03466a7
Use newer macsesh.
sheagcraig May 27, 2020
c8006ee
Use client setup util.
sheagcraig May 27, 2020
401a347
Create generic pref getting mac util.
sheagcraig May 27, 2020
9d7cc6a
Use mac_pref util in sal-submit.
sheagcraig May 27, 2020
aec86ba
Move Mac-specific sal pkg code to a dedicated mac_utils module.
sheagcraig May 28, 2020
63ad327
Move more mac-specific code to mac_utils.
sheagcraig May 28, 2020
57d0069
Fix missing import.
sheagcraig May 30, 2020
4045653
Use status code objects rather than int literal.
sheagcraig Jul 13, 2020
c5a2d20
Really old machines
johnmikee Jul 14, 2020
8447cb7
Merge pull request #75 from johnmikep/master
grahamgilbert Jul 14, 2020
32b2989
Fix profile checkin error.
Jul 27, 2020
dd2189c
Merge pull request #78 from Zolotkey/master
grahamgilbert Jul 27, 2020
59022e1
add urllib3 to requirements.txt that includes fixes for BigSur
weswhet Aug 3, 2020
b0cb706
update pyobjc to BigSur supported version
weswhet Aug 3, 2020
7b0c984
Merge pull request #79 from weswhet/wes/bigsur_urllib3
grahamgilbert Aug 3, 2020
a4ec731
Add requests.
sheagcraig Apr 17, 2020
0a07dc9
WS fix.
sheagcraig Apr 30, 2020
9896100
Add MacSesh package to sal-scripts Python requirements.txt.
sheagcraig May 1, 2020
6f33f26
Add SalClient class to replace curl func and related.
sheagcraig May 1, 2020
9aad897
Update preflight script to use requests.
sheagcraig May 1, 2020
dedd23e
Update machine_checkin model lookup to use requests.
sheagcraig May 1, 2020
73cf745
Update sal-submit to use requests.
sheagcraig May 1, 2020
27dc7b8
Skip trying to execute py3 cache, and set up place to skip others.
sheagcraig May 1, 2020
3f839dd
Handle json errors in checkin results by using an empty dict.
sheagcraig May 4, 2020
4837a26
Move SalClient into its own module.
sheagcraig May 4, 2020
8dce76b
Move URL building to SalClient for sal-submit.
sheagcraig May 4, 2020
7578ddc
Use SalClient URL builder for preflight.
sheagcraig May 4, 2020
8e9b930
Fix missed URL update to new SalClient.
sheagcraig May 4, 2020
627823a
Add module-private SalClient "singleton" for session reuse purposes.
sheagcraig May 4, 2020
969d4e2
Remove unused import.
sheagcraig May 4, 2020
0b63f15
Do a better job of handling requests exceptions.
sheagcraig May 4, 2020
ab57060
Remove now unused arg.
sheagcraig May 8, 2020
010c7a1
Rethink how `[In|Unin]stallResults` get merged into `ManagedItem`s.
sheagcraig May 8, 2020
bb0459c
Add property for setting auth.
sheagcraig May 8, 2020
9a5f00e
Add commandline args to allow you to override ServerURL and key.
sheagcraig May 8, 2020
6e87985
Add prefs debug output.
sheagcraig May 8, 2020
7221070
Do some processing client side so we don't send so much profile data.
sheagcraig May 8, 2020
8037471
Fix bug with downloading plugin scripts.
sheagcraig May 27, 2020
1fd7807
Fix executable script check in utils.
sheagcraig May 27, 2020
d914a0b
Remove unused imports.
sheagcraig May 27, 2020
8fefc39
Move preference setting code out of client and bump macsesh version.
sheagcraig May 27, 2020
01bcc00
Use new session name.
sheagcraig May 27, 2020
df59a6e
Bump python version.
sheagcraig May 27, 2020
5550d0f
Add pref-based client setup code into new mac_utils module.
sheagcraig May 27, 2020
58d56bc
Use newer macsesh.
sheagcraig May 27, 2020
681ee58
Use client setup util.
sheagcraig May 27, 2020
f03b92c
Create generic pref getting mac util.
sheagcraig May 27, 2020
08d6842
Use mac_pref util in sal-submit.
sheagcraig May 27, 2020
040626f
Move Mac-specific sal pkg code to a dedicated mac_utils module.
sheagcraig May 28, 2020
f789c16
Move more mac-specific code to mac_utils.
sheagcraig May 28, 2020
2ebce50
Fix missing import.
sheagcraig May 30, 2020
f5c2003
Use status code objects rather than int literal.
sheagcraig Jul 13, 2020
ac77f01
Update requests.
sheagcraig Aug 21, 2020
4e6fef0
Merge branch 'requests' of https://github.com/salopensource/sal-scrip…
sheagcraig Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unused imports.
  • Loading branch information
@sheagcraig
sheagcraig committed Aug 21, 2020
commit d914a0bb9bf3ec35a79f00e602b125393547743d
6 changes: 0 additions & 6 deletions sal_python_pkg/sal/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,17 @@
import datetime
import hashlib
import json
import logging
import os
import pathlib
import plistlib
import stat
import subprocess
import time
import urllib.parse

import macsesh
from Foundation import (
kCFPreferencesAnyUser, kCFPreferencesCurrentHost, CFPreferencesSetValue,
CFPreferencesAppSynchronize, CFPreferencesCopyAppValue, CFPreferencesAppValueIsForced, NSDate,
NSArray, NSDictionary, NSData, NSNull)

import sal.version


BUNDLE_ID = 'com.github.salopensource.sal'
RESULTS_PATH = '/usr/local/sal/checkin_results.json'
Expand Down