From 6e0fef13224881fd0c79d0b17280b5f69661f170 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 14 Nov 2005 20:11:02 +0000 Subject: Flickrfs fix svn path=/; revision=524 --- net-fs/flickrfs/files/flickrfs-1.1.patch | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'net-fs/flickrfs') diff --git a/net-fs/flickrfs/files/flickrfs-1.1.patch b/net-fs/flickrfs/files/flickrfs-1.1.patch index 46b5a8e..a23a286 100644 --- a/net-fs/flickrfs/files/flickrfs-1.1.patch +++ b/net-fs/flickrfs/files/flickrfs-1.1.patch @@ -31,23 +31,23 @@ diff -Naur --exclude='*.pyc' flickrfs-1.1/flickrfs.conf flickrfs-1.1-mod/flickrf + diff -Naur --exclude='*.pyc' flickrfs-1.1/flickrfs.py flickrfs-1.1-mod/flickrfs.py --- flickrfs-1.1/flickrfs.py 2005-11-08 22:01:39.000000000 +0100 -+++ flickrfs-1.1-mod/flickrfs.py 2005-11-14 21:01:30.000000000 +0100 ++++ flickrfs-1.1-mod/flickrfs.py 2005-11-14 21:10:49.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!python #@+leo-ver=4 #@+node:@file flickrfs.py # v0.9 - Initial release -@@ -48,11 +48,26 @@ +@@ -48,11 +48,22 @@ #Import flickr python api from flickrapi import FlickrAPI +-# flickr auth information +-flickrAPIKey = "f8aa9917a9ae5e44a87cae657924f42d" # API key +-flickrSecret = "3fbf7144be7eca28" # shared "secret" +-browserName = "/usr/bin/firefox" # for out-of-band auth inside a web browser +# Import ConfigParser +from ConfigParser import ConfigParser - # flickr auth information - flickrAPIKey = "f8aa9917a9ae5e44a87cae657924f42d" # API key - flickrSecret = "3fbf7144be7eca28" # shared "secret" - browserName = "/usr/bin/firefox" # for out-of-band auth inside a web browser +def read_config(config_file = '/etc/flickrfs/flickrfs.conf'): + defaults = { @@ -65,17 +65,7 @@ diff -Naur --exclude='*.pyc' flickrfs-1.1/flickrfs.py flickrfs-1.1-mod/flickrfs. class TransFlickr: #Transactions with flickr def uploadfile(self, filepath, taglist, bufData, mode): -@@ -222,6 +237,9 @@ - global token - global DefaultBlockSize - DefaultBlockSize = 4*1024 #4KB -+ -+ print flickrAPIKey -+ - fapi = FlickrAPI(flickrAPIKey, flickrSecret) - - # proceed with auth -@@ -700,6 +718,12 @@ +@@ -700,6 +711,12 @@ #@+node:mainline if __name__ == '__main__': -- cgit v1.2.3-65-gdbad