Permalink
Browse files

get rid of clojure-contrib

  • Loading branch information...
1 parent 998fe35 commit 52e731c4cb4aa4807c53ef8ad442684d6dbf4a04 Moritz Heidkamp committed Mar 24, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −0 project.clj
  2. +1 −2 src/clj_oauth2/ring.clj
  3. +2 −2 test/clj_oauth2/client_test.clj
View
@@ -5,6 +5,7 @@
[clj-http "0.2.6"]
[uri "1.1.0"]
[commons-codec/commons-codec "1.6"]]
+ :exclusions [org.clojure/clojure-contrib]
:dev-dependencies [[ring "0.3.11"]
[com.stuartsierra/lazytest "1.1.2"
:exclusions [swank-clojure]]]
View
@@ -1,6 +1,5 @@
(ns clj-oauth2.ring
- (:require [clojure.contrib.java-utils :as java-utils]
- [clj-oauth2.client :as oauth2]
+ (:require [clj-oauth2.client :as oauth2]
[ring.util.codec :as codec]
[clojure.string :as string]))
@@ -6,7 +6,7 @@
(:require [clj-oauth2.client :as base]
[ring.adapter.jetty :as ring]
[uri.core :as uri]
- [clojure.contrib.string :as str])
+ [clojure.string :as str])
(:import [clj_oauth2 OAuth2Exception OAuth2StateMismatchException]
[org.apache.commons.codec.binary Base64]))
@@ -61,7 +61,7 @@
(let [[scheme param] (parse-base64-auth-header req)]
(and scheme param
(= "basic" scheme)
- (str/split #":" 2 param))))
+ (str/split param #":" 2))))
(defn handle-protected-resource [req grant & [deny]]
(let [query (uri/form-url-decode (:query-string req))

0 comments on commit 52e731c

Please sign in to comment.