forked from openwrt/packages
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bigclown-control-tool: use Python's json lib
From: hardwario/bch-control-tool#5 This is a backport version 0.2.0 Signed-off-by: Alexandru Ardelean <[email protected]>
- Loading branch information
Showing
2 changed files
with
50 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
.../bigclown/bigclown-control-tool/patches/0001-bch-use-Python-s-built-in-json-library.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| diff --git a/bch.egg-info/requires.txt b/bch.egg-info/requires.txt | ||
| index b84c685..4352f26 100644 | ||
| --- a/bch.egg-info/requires.txt | ||
| +++ b/bch.egg-info/requires.txt | ||
| @@ -3,4 +3,3 @@ click-log>=0.2.1 | ||
| paho-mqtt>=1.0 | ||
| pyserial>=3.0 | ||
| PyYAML>=3.11 | ||
| -simplejson>=3.6.0 | ||
| diff --git a/bch/cli.py b/bch/cli.py | ||
| index 83cae3e..48d8e93 100755 | ||
| --- a/bch/cli.py | ||
| +++ b/bch/cli.py | ||
| @@ -6,7 +6,7 @@ import sys | ||
| import logging | ||
| import click | ||
| import click_log | ||
| -import simplejson as json | ||
| +import json | ||
| from datetime import datetime | ||
| import paho.mqtt.client | ||
| from paho.mqtt.client import topic_matches_sub | ||
| diff --git a/bch/mqtt_client.py b/bch/mqtt_client.py | ||
| index 7ce1576..fc8fbae 100644 | ||
| --- a/bch/mqtt_client.py | ||
| +++ b/bch/mqtt_client.py | ||
| @@ -1,7 +1,7 @@ | ||
| import paho.mqtt.client | ||
| from paho.mqtt.client import topic_matches_sub | ||
| import logging | ||
| -import simplejson as json | ||
| +import json | ||
| import time | ||
|
|
||
|
|
||
| diff --git a/setup.py b/setup.py | ||
| index 26aefa3..9af3fbb 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -3,7 +3,7 @@ | ||
|
|
||
| from setuptools import setup, find_packages | ||
|
|
||
| -requirements = ['Click>=6.0', 'click-log>=0.2.1', 'paho-mqtt>=1.0', 'pyserial>=3.0', 'PyYAML>=3.11', 'simplejson>=3.6.0'] | ||
| +requirements = ['Click>=6.0', 'click-log>=0.2.1', 'paho-mqtt>=1.0', 'pyserial>=3.0', 'PyYAML>=3.11'] | ||
|
|
||
| setup( | ||
| name='bch', |