xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Wrap some lines with length greater than 120.

Browse source 
With some tweaks by tabbott.
This commit is contained in:
Taranjeet 2016-07-02 23:23:19 +05:30 committed by Tim Abbott
parent d198eedbcd
commit 6034ae7b9a
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bots/jabber_mirror_backend.py
View file

@ -381,7 +381,8 @@ option does not affect login credentials.'''.replace("\n", " "))
config.readfp(f, config_file) config.readfp(f, config_file)
except IOError: except IOError:
pass pass
for option in ("jid", "jabber_password", "conference_domain", "mode", "zulip_email_suffix", "jabber_server_address", "jabber_server_port"): for option in ("jid", "jabber_password", "conference_domain", "mode", "zulip_email_suffix",
"jabber_server_address", "jabber_server_port"):
if (getattr(options, option) is None if (getattr(options, option) is None
and config.has_option("jabber_mirror", option)): and config.has_option("jabber_mirror", option)):
setattr(options, option, config.get("jabber_mirror", option)) setattr(options, option, config.get("jabber_mirror", option))

6
integrations/codebase/zulip_codebase_mirror
View file

@ -208,7 +208,8 @@ def handle_event(event):
subject = "Discussion: %s" % (subj,) subject = "Discussion: %s" % (subj,)
if category: if category:
content = "%s started a new discussion in %s:\n\n~~~ quote\n%s\n~~~" % (actor_name, category, comment_content) format_str = "%s started a new discussion in %s:\n\n~~~ quote\n%s\n~~~"
content = format_str % (actor_name, category, comment_content)
else: else:
content = "%s posted:\n\n~~~ quote\n%s\n~~~" % (actor_name, comment_content) content = "%s posted:\n\n~~~ quote\n%s\n~~~" % (actor_name, comment_content)
@ -223,7 +224,8 @@ def handle_event(event):
start_ref_url = make_url("projects/%s/repositories/%s/commit/%s" % (project_link, repo_link, start_ref)) start_ref_url = make_url("projects/%s/repositories/%s/commit/%s" % (project_link, repo_link, start_ref))
end_ref_url = make_url("projects/%s/repositories/%s/commit/%s" % (project_link, repo_link, end_ref)) end_ref_url = make_url("projects/%s/repositories/%s/commit/%s" % (project_link, repo_link, end_ref))
between_url = make_url("projects/%s/repositories/%s/compare/%s...%s" % (project_link, repo_link, start_ref, end_ref)) between_url = make_url("projects/%s/repositories/%s/compare/%s...%s" % (
project_link, repo_link, start_ref, end_ref))
subject = "Deployment to %s" % (environment,) subject = "Deployment to %s" % (environment,)

15
integrations/twitter/twitter-bot
View file

@ -45,11 +45,12 @@ parser = optparse.OptionParser(r"""
Slurp tweets on your timeline into a specific zulip stream. Slurp tweets on your timeline into a specific zulip stream.
Run this on your personal machine. Your API key and twitter id are revealed to local Run this on your personal machine. Your API key and twitter id
users through the command line or config file. are revealed to local users through the command line or config
file.
This bot uses OAuth to authenticate with twitter. Please create a ~/.zulip_twitterrc with This bot uses OAuth to authenticate with twitter. Please create a
the following contents: ~/.zulip_twitterrc with the following contents:
[twitter] [twitter]
consumer_key = consumer_key =
@ -57,14 +58,16 @@ parser = optparse.OptionParser(r"""
access_token_key = access_token_key =
access_token_secret = access_token_secret =
In order to obtain a consumer key & secret, you must register a new application under your twitter account: In order to obtain a consumer key & secret, you must register a
new application under your twitter account:
1. Go to http://dev.twitter.com 1. Go to http://dev.twitter.com
2. Log in 2. Log in
3. In the menu under your username, click My Applications 3. In the menu under your username, click My Applications
4. Create a new application 4. Create a new application
Make sure to go the application you created and click "create my access token" as well. Fill in the values displayed. Make sure to go the application you created and click "create my
access token" as well. Fill in the values displayed.
Depends on: twitter-python Depends on: twitter-python
""") """)

3
zulip/__init__.py
View file

@ -150,7 +150,8 @@ def get_default_config_filename():
config_file = os.path.join(os.environ["HOME"], ".zuliprc") config_file = os.path.join(os.environ["HOME"], ".zuliprc")
if (not os.path.exists(config_file) and if (not os.path.exists(config_file) and
os.path.exists(os.path.join(os.environ["HOME"], ".humbugrc"))): os.path.exists(os.path.join(os.environ["HOME"], ".humbugrc"))):
raise RuntimeError("The Zulip API configuration file is now ~/.zuliprc; please run:\n\n mv ~/.humbugrc ~/.zuliprc\n") raise RuntimeError("The Zulip API configuration file is now ~/.zuliprc; please run:\n\n"
" mv ~/.humbugrc ~/.zuliprc\n")
return config_file return config_file
class Client(object): class Client(object):