From a90400c54a07db192e71f0ba08b52fe268e00a53 Mon Sep 17 00:00:00 2001 From: r4sas Date: Thu, 2 Mar 2017 14:23:05 +0300 Subject: [PATCH] * added license * some fixes --- LICENSE | 17 +++++++++++++++++ README.md | 5 +++++ pbincli.py | 5 +---- pbincli/actions.py | 6 ++++-- pbincli/settings.py | 8 +++++--- pbincli/utils.py | 3 +-- 6 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1cfe7f8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,17 @@ + DWTFYWWI LICENSE + Version 1, January 2006 + + Copyright (C) 2006 Ævar Arnfjörð Bjarmason + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the DWTFYWWI or Do +Whatever The Fuck You Want With It license is intended to guarantee +your freedom to share and change the software--to make sure the +software is free for all its users. + + DWTFYWWI LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +0. The author grants everyone permission to do whatever the fuck they +want with the software, whatever the fuck that may be. diff --git a/README.md b/README.md index d3bdcfc..a776542 100644 --- a/README.md +++ b/README.md @@ -34,3 +34,8 @@ It must be formated like `pasteID#passphrase`. Example: More info you can find by typing $ python pbincli.py {send,get} -h + +License +------- +This project is licensed under the DWTFYWWI license, which can be found in the file +LICENSE in the root of the project source code. diff --git a/pbincli.py b/pbincli.py index 6ca225f..c6580e4 100755 --- a/pbincli.py +++ b/pbincli.py @@ -1,8 +1,5 @@ #! /usr/bin/env python -import os -import sys -import argparse - +import os, sys, argparse import pbincli.actions from pbincli.utils import PBinCLIException diff --git a/pbincli/actions.py b/pbincli/actions.py index 567aef3..174e9cc 100644 --- a/pbincli/actions.py +++ b/pbincli/actions.py @@ -1,14 +1,16 @@ import json, hashlib, ntpath, os, sys -import pbincli.actions, pbincli.sjcl_simple -import pbincli.settings +import pbincli.actions, pbincli.sjcl_simple, pbincli.settings from base64 import b64encode, b64decode from mimetypes import guess_type from pbincli.transports import privatebin from pbincli.utils import PBinCLIException, check_readable, check_writable, json_load_byteified + +""" Initialise settings """ pbincli.settings.init() + def path_leaf(path): head, tail = ntpath.split(path) return tail or ntpath.basename(head) diff --git a/pbincli/settings.py b/pbincli/settings.py index cc2f1e2..fa523b0 100644 --- a/pbincli/settings.py +++ b/pbincli/settings.py @@ -1,10 +1,12 @@ def init(): global server, proxies, useproxy - """Edit that variables""" - server = "https://privatebin.net/" + """ Edit that variables """ + server = "http://paste.r4sas.i2p/" proxies = {'http': 'http://127.0.0.1:4444'} - useproxy = False + + """ True/False """ + useproxy = True """ There is nothing more to do :D """ diff --git a/pbincli/utils.py b/pbincli/utils.py index 0ca275e..f0b76bd 100644 --- a/pbincli/utils.py +++ b/pbincli/utils.py @@ -1,5 +1,4 @@ -import json -import os +import json, os class PBinCLIException(Exception):