Attachment 145260 Details for Bug 192346 – pybugz 0.10.1 diff

[patch] pybugz 0.10.1 diff

pybugz_0.10.1.diff (text/plain), 3.41 KB, created by Steve Wills on 2014-08-02 20:49:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2014-08-02 20:49:46 UTC

Size: 3.41 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 363622)
>+++ Makefile	(working copy)
>@@ -1,10 +1,10 @@
> # $FreeBSD$
> 
> PORTNAME=	pybugz
>-PORTVERSION=	0.9.3
>-PORTREVISION=	2
>+PORTVERSION=	0.10.1
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/
>+MASTER_SITES=	https://github.com/williamh/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
>+
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	crees@FreeBSD.org
>@@ -12,7 +12,6 @@
> 
> LICENSE=	GPLv2
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
> USE_PYTHON=	2
> USE_PYDISTUTILS=yes
> PYDISTUTILS_AUTOPLIST=	yes
>Index: distinfo
>===================================================================
>--- distinfo	(revision 363622)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (pybugz-0.9.3.tar.gz) = cc572ac66f372fe222e5e6e390c295b6fde1b72debdd1d9fa23c67b1d218daa7
>-SIZE (pybugz-0.9.3.tar.gz) = 232381
>+SHA256 (pybugz-0.10.1.tar.gz) = 9e94412062ff683e83b753c5dad0f7cd4c41f3b2e53ed51faedb3fe2f6b550b5
>+SIZE (pybugz-0.10.1.tar.gz) = 23120
>Index: files/patch-bugz__cli.py
>===================================================================
>--- files/patch-bugz__cli.py	(revision 0)
>+++ files/patch-bugz__cli.py	(working copy)
>@@ -0,0 +1,71 @@
>+--- ./bugz/cli.py.orig	2012-05-06 20:37:35.000000000 +0000
>++++ ./bugz/cli.py	2014-08-02 20:38:22.976386635 +0000
>+@@ -29,6 +29,7 @@
>+ """
>+ 
>+ DEFAULT_COOKIE_FILE = '.bugz_cookie'
>++DEFAULT_TOKEN_FILE = '.bugz_token'
>+ DEFAULT_NUM_COLS = 80
>+ 
>+ #
>+@@ -143,6 +144,12 @@
>+ 		except IOError:
>+ 			pass
>+ 
>++		self.token_file = os.path.join(os.environ['HOME'], DEFAULT_TOKEN_FILE)
>++		try:
>++			self.token = open(self.token_file).read().strip()
>++		except IOError:
>++			self.token = None
>++
>+ 		if getattr(args, 'encoding'):
>+ 			self.enc = args.encoding
>+ 		else:
>+@@ -170,16 +177,21 @@
>+ 	def get_input(self, prompt):
>+ 		return raw_input(prompt)
>+ 
>++	def set_token(self, *args):
>++		if args and self.token:
>++			args[0]['Bugzilla_token'] = self.token
>++		return args
>++
>+ 	def bzcall(self, method, *args):
>+ 		"""Attempt to call method with args. Log in if authentication is required.
>+ 		"""
>+ 		try:
>+-			return method(*args)
>++			return method(*self.set_token(*args))
>+ 		except xmlrpclib.Fault, fault:
>+ 			# Fault code 410 means login required
>+ 			if fault.faultCode == 410 and not self.skip_auth:
>+ 				self.login()
>+-				return method(*args)
>++				return method(*self.set_token(*args))
>+ 			raise
>+ 
>+ 	def login(self, args=None):
>+@@ -208,10 +220,21 @@
>+ 			params['remember'] = True
>+ 		self.log('Logging in')
>+ 		self.bz.User.login(params)
>++		log_info('Logging in')
>++		result = self.bz.User.login(params)
>++		if 'token' in result:
>++			self.token = result['token']
>+ 
>+ 		if args is not None:
>+-			self.cookiejar.save()
>+-			os.chmod(self.cookiejar.filename, 0600)
>++			if self.token:
>++				fd = open(self.token_file, 'w')
>++				fd.write(self.token)
>++				fd.write('\n')
>++				fd.close()
>++				os.chmod(self.token_file, 0600)
>++			else:
>++				self.cookiejar.save()
>++				os.chmod(self.cookiejar.filename, 0600)
>+ 
>+ 	def logout(self, args):
>+ 		self.log('logging out')
>
>Property changes on: files/patch-bugz__cli.py
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 192346: 145260